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

Michael Stefaniuc : ole32: COM cleanup in filemoniker.c.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 70c038dc2f5287da3e9dce469da9a7872736626a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c038dc2f5287da3e9dce469… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 30 00:36:57 2011 +0200 ole32: COM cleanup in filemoniker.c. --- dlls/ole32/filemoniker.c | 82 +++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70c038dc2f5287da3e9dc…

1 0

Andrew Talbot : winex11.drv: Remove unneeded address-of operator from function name.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 42df50ab662b50fbc3c2d9b3a0850be1ea417918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42df50ab662b50fbc3c2d9b3a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:29 2011 +0100 winex11.drv: Remove unneeded address-of operator from function name. --- dlls/winex11.drv/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cda8f9e..caf2406 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2574,7 +2574,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow) else { HANDLE event = CreateEventW(NULL, FALSE, FALSE, NULL); - selectionThread = CreateThread(NULL, 0, &selection_thread_proc, event, 0, NULL); + selectionThread = CreateThread(NULL, 0, selection_thread_proc, event, 0, NULL); if (!selectionThread) {

1 0

Andrew Talbot : wined3d: Remove unneeded address-of operators from function names.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 094dd38b007345979ce6a146ca214a5da092d305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094dd38b007345979ce6a146c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:22 2011 +0100 wined3d: Remove unneeded address-of operators from function names. --- dlls/wined3d/utils.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=094dd38b007345979ce6a…

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from function name.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 2e4224fe2c878cf3acca77d5979f7076ccf772c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4224fe2c878cf3acca77d59… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:16 2011 +0100 shell32: Remove unneeded address-of operators from function name. --- dlls/shell32/shv_item_cmenu.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 2dd8cd6..245bbd4 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -382,7 +382,7 @@ static BOOL DoCopyOrCut(ItemCmImpl *This, HWND hwnd, BOOL bCut) * Used by DoOpenProperties through SHCreatePropSheetExtArrayEx to add * propertysheet pages from shell extensions. */ -static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) +static BOOL CALLBACK Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) { LPPROPSHEETHEADERW psh = (LPPROPSHEETHEADERW) lparam; psh->u3.phpage[psh->nPages++] = hpage; @@ -476,17 +476,13 @@ static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo); if (hpsxa != NULL) { - SHAddFromPropSheetExtArray((HPSXA)hpsxa, - (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, - (LPARAM)&psh); + SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh); SHDestroyPropSheetExtArray(hpsxa); } hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo); if (hpsxa != NULL) { - SHAddFromPropSheetExtArray((HPSXA)hpsxa, - (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, - (LPARAM)&psh); + SHAddFromPropSheetExtArray(hpsxa, Properties_AddPropSheetCallback, (LPARAM)&psh); SHDestroyPropSheetExtArray(hpsxa); } IDataObject_Release(lpDo);

1 0

Andrew Talbot : comctl32: Remove unneeded address-of operator from function name.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 92c408cd66bebfd08b7ada328545090d1d916975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c408cd66bebfd08b7ada328… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 29 22:36:10 2011 +0100 comctl32: Remove unneeded address-of operator from function name. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bcfd173..cc997c1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2594,7 +2594,7 @@ static INT LISTVIEW_MapIdToIndex(const LISTVIEW_INFO *infoPtr, UINT iID) if (infoPtr->nItemCount == 0) return -1; ID.id = iID; - index = DPA_Search(infoPtr->hdpaItemIds, &ID, -1, &MapIdSearchCompare, 0, DPAS_SORTED); + index = DPA_Search(infoPtr->hdpaItemIds, &ID, -1, MapIdSearchCompare, 0, DPAS_SORTED); if (index != -1) {

1 0

Aric Stewart : usp10: When calling ShapeIndicSyllables we need to use cChars which is the actual number of original characters .
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 8b14f3f542a38d32317ec766c7513bef21c7beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b14f3f542a38d32317ec766c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 29 14:55:04 2011 -0500 usp10: When calling ShapeIndicSyllables we need to use cChars which is the actual number of original characters. --- dlls/usp10/shape.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0068b41..499829f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2417,7 +2417,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * /* Step 4: Base Form application to syllables */ GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2474,7 +2474,7 @@ static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2544,7 +2544,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * } /* Step 4: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2592,7 +2592,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2632,7 +2632,7 @@ static void ContextualShape_Gujarati(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 2: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2688,7 +2688,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2738,7 +2738,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2787,7 +2787,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2839,7 +2839,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables); @@ -2884,7 +2884,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *pcGlyphs = cCount; /* Step 3: Base Form application to syllables */ - ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern); + ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern); HeapFree(GetProcessHeap(),0,input); HeapFree(GetProcessHeap(),0,syllables);

1 0

Francois Gouget : services: Refuse to start disabled services.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: eafb44d4e1fd6ac455e9529b1d74385c2163b1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafb44d4e1fd6ac455e9529b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:53:04 2011 +0200 services: Refuse to start disabled services. --- dlls/advapi32/tests/service.c | 2 +- programs/services/rpc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 044394a..d2ef54d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2151,7 +2151,7 @@ static void test_start_stop(void) goto cleanup; } le = try_start_stop(svc_handle, displayname, is_nt4); - todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); + ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); /* Then one with a bad path */ displayname = "Winetest Bad Path"; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index fe33ce1..573b748 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -961,6 +961,9 @@ DWORD __cdecl svcctl_StartServiceW( if ((err = validate_service_handle(hService, SERVICE_START, &service)) != 0) return err; + if (service->service_entry->config.dwStartType == SERVICE_DISABLED) + return ERROR_SERVICE_DISABLED; + err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); return err;

1 0

Alexandre Julliard : gdi32: Add a helper function to initialize DIB info from a bitmap object.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 79ef408cd76d41c4d3ecfb0ac9f5534c8ea46503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef408cd76d41c4d3ecfb0ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:26:50 2011 +0200 gdi32: Add a helper function to initialize DIB info from a bitmap object. --- dlls/gdi32/dibdrv/bitblt.c | 10 ++-------- dlls/gdi32/dibdrv/dc.c | 10 ++++++++-- dlls/gdi32/dibdrv/dibdrv.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 646aaf0..563cb0a 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -621,10 +621,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; @@ -722,10 +719,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 234f827..245e7c7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -211,6 +211,13 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); } +BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) +{ + assert(bmp->dib); + return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); +} + static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; @@ -368,8 +375,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) clear_dib_info(&pdev->brush_dib); pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, private_color_table)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2e555e3..23a59ee 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -80,6 +80,7 @@ extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;

1 0

André Hentschel : version: Return VIF_CANNOTREADSRC if no source path could be generated.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 87ebfe5d18b59017feb70a98aa8db0b2c745799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ebfe5d18b59017feb70a98a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:11:28 2011 +0200 version: Return VIF_CANNOTREADSRC if no source path could be generated. --- dlls/version/version.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 1e581ee..8ea0209 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1341,6 +1341,7 @@ DWORD WINAPI VerInstallFileA( flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen ); xret = 0; + if (!srcdir || !srcfilename) return VIF_CANNOTREADSRC; sprintf(srcfn,"%s\\%s",srcdir,srcfilename); if (!destdir || !*destdir) pdest = srcdir; else pdest = destdir;

1 0

André Hentschel : d3dcompiler_43/tests: Fix printing a NULL string.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 550e2a9f6af429fffbf205a7fc6fc8be65ff9620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550e2a9f6af429fffbf205a7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:10:56 2011 +0200 d3dcompiler_43/tests: Fix printing a NULL string. --- dlls/d3dcompiler_43/tests/asm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 5c01983..18bdd16 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1440,7 +1440,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i char include3[] = "vs.1.1\n"; trace("filename %s\n", filename); - trace("parent_data (%p) -> %s\n", parent_data, (char *)parent_data); + trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); if (!strcmp(filename, "incl.vsh")) {

1 0