November 2020 - Wine-Commits

Zebediah Figura : qcap: Use malloc() instead of HeapAlloc() or CoTaskMemAlloc().
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: b0b63aec47828d9e8dea485423fd3fe0e87c9f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b63aec47828d9e8dea4854… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:36 2020 -0600 qcap: Use malloc() instead of HeapAlloc() or CoTaskMemAlloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 5 ++--- dlls/qcap/avico.c | 12 +++++------- dlls/qcap/avimux.c | 26 ++++++++++++-------------- dlls/qcap/capturegraph.c | 4 ++-- dlls/qcap/filewriter.c | 11 +++++------ dlls/qcap/qcap_private.h | 1 - dlls/qcap/smartteefilter.c | 7 +++---- dlls/qcap/vfwcapture.c | 5 ++--- 8 files changed, 31 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0b63aec47828d9e8dea…

1 0

Zebediah Figura : qcap: Use malloc() instead of heap_alloc().
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 8bcb4466c99dcc5622bca584ca3b9a00f3e0d012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bcb4466c99dcc5622bca584… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:30 2020 -0600 qcap: Use malloc() instead of heap_alloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b5a599eb0bc..2ba423ea0e5 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -116,9 +116,9 @@ static void v4l_device_destroy(struct video_capture_device *device) if (device->fd != -1) video_close(device->fd); if (device->caps_count) - heap_free(device->caps); - heap_free(device->image_data); - heap_free(device); + free(device->caps); + free(device->image_data); + free(device); } static const struct caps *find_caps(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) @@ -167,7 +167,7 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * height = caps->video_info.bmiHeader.biHeight; image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; - if (!(image_data = heap_alloc(image_size))) + if (!(image_data = malloc(image_size))) { ERR("Failed to allocate memory.\n"); return E_OUTOFMEMORY; @@ -183,14 +183,14 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * || format.fmt.pix.height != height) { ERR("Failed to set pixel format: %s.\n", strerror(errno)); - heap_free(image_data); + free(image_data); return VFW_E_TYPE_NOT_ACCEPTED; } device->current_caps = caps; device->image_size = image_size; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; - heap_free(device->image_data); + free(device->image_data); device->image_data = image_data; return S_OK; } @@ -407,7 +407,7 @@ struct video_capture_device *v4l_device_create(USHORT index) have_libv4l2 = video_init(); - if (!(device = heap_alloc_zero(sizeof(*device)))) + if (!(device = calloc(1, sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", index); @@ -509,7 +509,7 @@ struct video_capture_device *v4l_device_create(USHORT index) else ERR("Failed to get fps: %s.\n", strerror(errno)); - new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + new_caps = realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); if (!new_caps) goto error; device->caps = new_caps;

1 0

Piotr Caban : msvcrt: Use type ranges definition from public header.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 758460faf7080efaadfe92a221ad6c623f561be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=758460faf7080efaadfe92a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 14:17:01 2020 +0100 msvcrt: Use type ranges definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 9 +++++---- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/math.c | 9 +++++---- dlls/msvcrt/msvcrt.h | 26 ------------------------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/string.c | 53 ++++++++++++++++++++++++++------------------------- dlls/msvcrt/time.c | 4 ++-- dlls/msvcrt/wcs.c | 36 +++++++++++++++++----------------- include/msvcrt/math.h | 4 ++++ 9 files changed, 66 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=758460faf7080efaadfe…

1 0

Hans Leidekker : wbemprox: Mark some string properties as dynamic.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 81e0a6225f1b21294ea244d660c7b556249cf401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e0a6225f1b21294ea244d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 27 09:14:45 2020 +0100 wbemprox: Mark some string properties as dynamic. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index be22d8d3066..9bd58ca77e6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,10 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { - { L"DeviceID", CIM_STRING }, + { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, - { L"PNPDeviceID", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ProductName", CIM_STRING }, { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 },

1 0

Michael Stefaniuc : ole32: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 137acffdf41945bea86726165081621023c6186f URL: https://source.winehq.org/git/wine.git/?a=commit;h=137acffdf41945bea8672616… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 26 22:20:04 2020 +0100 ole32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/clipboard.c | 6 ++--- dlls/ole32/comcat.c | 8 +++---- dlls/ole32/compobj.c | 37 +++++++++++-------------------- dlls/ole32/datacache.c | 6 ++--- dlls/ole32/defaulthandler.c | 3 +-- dlls/ole32/itemmoniker.c | 3 +-- dlls/ole32/moniker.c | 6 ++--- dlls/ole32/ole2.c | 53 +++++++++++++-------------------------------- dlls/ole32/stg_prop.c | 6 ++--- dlls/ole32/storage32.c | 51 +++++++++++++++---------------------------- 11 files changed, 60 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=137acffdf41945bea867…

1 0

Hans Leidekker : oledb32: Add a partial implementation of IErrorRecords_GetErrorInfo().
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: b7f70aa02682005abc6d82cf1a75b97ab23a117d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f70aa02682005abc6d82cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 27 09:14:44 2020 +0100 oledb32: Add a partial implementation of IErrorRecords_GetErrorInfo(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 2 +- dlls/oledb32/tests/database.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 985d5837a29..9987b2113bf 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -361,7 +361,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, &IID_IErrorInfo, (void **)ppErrorInfo); } static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c2b7e0598dd..1897d57623f 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -486,6 +486,14 @@ static void test_errorinfo(void) ok(dispparams.cArgs == 1, "Got argument count %u\n", dispparams.cArgs); ok(dispparams.cNamedArgs == 1, "Got named argument count %u\n", dispparams.cNamedArgs); + EXPECT_REF(errrecs, 2); + EXPECT_REF(errorinfo, 2); + hr = IErrorRecords_GetErrorInfo(errrecs, 0, 0, &errorinfo2); + ok(hr == S_OK, "got %08x\n", hr); + ok(errorinfo == errorinfo2, "different object\n"); + EXPECT_REF(errorinfo, 3); + IErrorInfo_Release(errorinfo2); + free_dispparams(&dispparams); VariantClear(&arg);

1 0

Michael Stefaniuc : ole32: Use wide-char string literals in filemoniker.c.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 496c6734e4d89104ab189b38ad6cbb81c6fdec71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=496c6734e4d89104ab189b38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 27 09:00:22 2020 +0000 ole32: Use wide-char string literals in filemoniker.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index e5978169ca1..d8c401c8978 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -657,8 +657,6 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, { HRESULT res; LPOLESTR str1=0,str2=0,*strDec1=0,*strDec2=0,newStr=0; - static const WCHAR twoPoint[]={'.','.',0}; - static const WCHAR bkSlash[]={'\\',0}; IBindCtx *bind=0; int i=0,j=0,lastIdx1=0,lastIdx2=0; DWORD mkSys, order; @@ -687,17 +685,15 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, lastIdx1=FileMonikerImpl_DecomposePath(str1,&strDec1)-1; lastIdx2=FileMonikerImpl_DecomposePath(str2,&strDec2)-1; - if ((lastIdx1==-1 && lastIdx2>-1)||(lastIdx1==1 && wcscmp(strDec1[0],twoPoint)==0)) + if ((lastIdx1 == -1 && lastIdx2 > -1) || (lastIdx1 == 1 && !wcscmp(strDec1[0], L".."))) res = MK_E_SYNTAX; else{ - if(wcscmp(strDec1[lastIdx1],bkSlash)==0) + if (!wcscmp(strDec1[lastIdx1], L"\\")) lastIdx1--; /* for each "..\" in the left of str2 remove the right element from str1 */ - for(i=0; ( (lastIdx1>=0) && (strDec2[i]!=NULL) && (wcscmp(strDec2[i],twoPoint)==0) ); i+=2){ - + for (i = 0; lastIdx1 >= 0 && strDec2[i] && !wcscmp(strDec2[i], L".."); i += 2) lastIdx1-=2; - } /* the length of the composed path string is increased by the sum of the two paths' lengths */ newStr=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(lstrlenW(str1)+lstrlenW(str2)+1)); @@ -707,8 +703,8 @@ FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, for(*newStr=0,j=0;j<=lastIdx1;j++) lstrcatW(newStr,strDec1[j]); - if ((strDec2[i]==NULL && lastIdx1>-1 && lastIdx2>-1) || wcscmp(strDec2[i],bkSlash)!=0) - lstrcatW(newStr,bkSlash); + if ((!strDec2[i] && lastIdx1 > -1 && lastIdx2 > -1) || wcscmp(strDec2[i], L"\\")) + lstrcatW(newStr, L"\\"); for(j=i;j<=lastIdx2;j++) lstrcatW(newStr,strDec2[j]); @@ -1016,7 +1012,6 @@ failed: */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) { - static const WCHAR bSlash[] = {'\\',0}; LPOLESTR word; int i=0,j,tabIndex=0, ret=0; LPOLESTR *strgtable ; @@ -1040,7 +1035,8 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) while(str[i]!=0){ - if(str[i]==bSlash[0]){ + if (str[i] == L'\\') + { strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); @@ -1050,14 +1046,14 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) goto lend; } - lstrcpyW(strgtable[tabIndex++],bSlash); + lstrcpyW(strgtable[tabIndex++], L"\\"); i++; } else { - for(j=0; str[i]!=0 && str[i]!=bSlash[0] ; i++,j++) + for (j = 0; str[i] && str[i] != L'\\'; i++, j++) word[j]=str[i]; word[j]=0; @@ -1103,7 +1099,6 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm HRESULT res; LPOLESTR str1=0,str2=0,*tabStr1=0,*tabStr2=0,relPath=0; DWORD len1=0,len2=0,sameIdx=0,j=0; - static const WCHAR back[] ={'.','.','\\',0}; TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); @@ -1150,7 +1145,7 @@ FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm if (len2>0 && !(len1==1 && len2==1 && sameIdx==0)) for(j=sameIdx;(tabStr1[j] != NULL); j++) if (*tabStr1[j]!='\\') - lstrcatW(relPath,back); + lstrcatW(relPath, L"..\\"); /* add items of the second path (similar items with the first path are not included) to the relativePath */ for(j=sameIdx;tabStr2[j]!=NULL;j++) @@ -1340,8 +1335,6 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa int nb=0,i; int sizeStr=lstrlenW(lpszPathName); LPOLESTR *tabStr=0; - static const WCHAR twoPoint[]={'.','.',0}; - static const WCHAR bkSlash[]={'\\',0}; BOOL addBkSlash; TRACE("(%p,%s)\n",This,debugstr_w(lpszPathName)); @@ -1364,18 +1357,20 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa if (nb > 0 ){ addBkSlash = TRUE; - if (wcscmp(tabStr[0],twoPoint)!=0) + if (wcscmp(tabStr[0], L"..")) addBkSlash = FALSE; else for(i=0;i<nb;i++){ - if ( (wcscmp(tabStr[i],twoPoint)!=0) && (wcscmp(tabStr[i],bkSlash)!=0) ){ + if (wcscmp(tabStr[i], L"..") && wcscmp(tabStr[i], L"\\")) + { addBkSlash = FALSE; break; } else - if (wcscmp(tabStr[i],bkSlash)==0 && i<nb-1 && wcscmp(tabStr[i+1],bkSlash)==0){ + if (!wcscmp(tabStr[i], L"\\") && i < nb - 1 && !wcscmp(tabStr[i+1], L"\\")) + { *tabStr[i]=0; sizeStr--; addBkSlash = FALSE; @@ -1383,7 +1378,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa } } - if (wcscmp(tabStr[nb-1],bkSlash)==0) + if (!wcscmp(tabStr[nb-1], L"\\")) addBkSlash = FALSE; This->filePathName=HeapReAlloc(GetProcessHeap(),0,This->filePathName,(sizeStr+1)*sizeof(WCHAR)); @@ -1394,7 +1389,7 @@ static HRESULT FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPa lstrcatW(This->filePathName,tabStr[i]); if (addBkSlash) - lstrcatW(This->filePathName,bkSlash); + lstrcatW(This->filePathName, L"\\"); } free_stringtable(tabStr); @@ -1447,11 +1442,10 @@ HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten, IMoniker **ppmk) { LPCWSTR end; - static const WCHAR wszSeparators[] = {':','\\','/','!',0}; for (end = szDisplayName + lstrlenW(szDisplayName); end && (end != szDisplayName); - end = memrpbrkW(szDisplayName, end - szDisplayName, wszSeparators)) + end = memrpbrkW(szDisplayName, end - szDisplayName, L":\\/!")) { HRESULT hr; IRunningObjectTable *rot; @@ -1538,7 +1532,6 @@ HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, { FileMonikerImpl* newFileMoniker; HRESULT hr; - static const WCHAR wszEmpty[] = { 0 }; TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); @@ -1551,7 +1544,7 @@ HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, if (!newFileMoniker) return E_OUTOFMEMORY; - hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty); + hr = FileMonikerImpl_Construct(newFileMoniker, L""); if (SUCCEEDED(hr)) hr = IMoniker_QueryInterface(&newFileMoniker->IMoniker_iface, riid, ppv);

1 0

Zebediah Figura : vkd3d-compiler: Add support for running the HLSL preprocessor.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: vkd3d Branch: master Commit: 9a4a5ba63ebd6fd09fe711c6ed02d2f4af12ad1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a4a5ba63ebd6fd09fe711c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:35 2020 -0600 vkd3d-compiler: Add support for running the HLSL preprocessor. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 3eee4bd..cec2ebb 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -163,6 +163,7 @@ static void print_usage(const char *program_name) " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" + " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" " output file is specified, output will be written to\n" " standard output.\n" @@ -196,6 +197,7 @@ struct options const char *profile; enum vkd3d_shader_source_type source_type; enum vkd3d_shader_target_type target_type; + bool preprocess_only; bool print_version; bool print_source_types; bool print_target_types; @@ -402,7 +404,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "b:e:ho:p:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:e:Eho:p:Vx:", long_options, NULL)) == -1) break; switch (option) @@ -429,6 +431,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->entry_point = optarg; break; + case 'E': + options->preprocess_only = true; + break; + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; @@ -669,7 +675,11 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_compile(&info, &output_code, &messages); + if (options.preprocess_only) + ret = vkd3d_shader_preprocess(&info, &output_code, &messages); + else + ret = vkd3d_shader_compile(&info, &output_code, &messages); + if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages);

1 0

Zebediah Figura : vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: vkd3d Branch: master Commit: 584f84737b2b8a49a4f4af76db27522138bf046a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=584f84737b2b8a49a4f4af7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:34 2020 -0600 vkd3d-compiler: Also pass the entry point as part of the SPIR-V target information. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index bcca04c..3eee4bd 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -583,6 +583,7 @@ static bool has_colour(FILE *f) int main(int argc, char **argv) { + struct vkd3d_shader_spirv_target_info spirv_target_info = {0}; struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; @@ -654,9 +655,14 @@ int main(int argc, char **argv) info.source_name = options.filename; hlsl_source_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_source_info.next = &spirv_target_info; hlsl_source_info.profile = options.profile; hlsl_source_info.entry_point = options.entry_point; + spirv_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + spirv_target_info.entry_point = options.entry_point; + spirv_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + if (!read_shader(&info.source, input)) { fprintf(stderr, "Failed to read input shader.\n");

1 0

Zebediah Figura : vkd3d-compiler: Rename the 'spirv' local variable to 'output_code'.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: vkd3d Branch: master Commit: 2164915450881d6a9cb3b91d262b23ea0b7d2292 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2164915450881d6a9cb3b91… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 26 11:54:33 2020 -0600 vkd3d-compiler: Rename the 'spirv' local variable to 'output_code'. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 7a1a5b0..bcca04c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -586,7 +586,7 @@ int main(int argc, char **argv) struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; - struct vkd3d_shader_code spirv; + struct vkd3d_shader_code output_code; struct options options; FILE *input, *output; char *messages; @@ -663,7 +663,7 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_compile(&info, &spirv, &messages); + ret = vkd3d_shader_compile(&info, &output_code, &messages); if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages); @@ -674,15 +674,15 @@ int main(int argc, char **argv) goto done; } - if (!write_shader(&spirv, output)) + if (!write_shader(&output_code, output)) { fprintf(stderr, "Failed to write output shader.\n"); - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); goto done; } fail = 0; - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); done: if (close_output) fclose(output);

1 0