May 2011 - Wine-commits - list.winehq.org

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetValue().
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 46b3727df3eec7b5ce649a28da78e6008d848f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b3727df3eec7b5ce649a28d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 3 14:46:52 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetValue(). --- dlls/d3dx9_36/effect.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 81ef017..6373f1c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -969,10 +969,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPVOID data, UINT bytes) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, data %p, bytes %u stub\n", This, parameter, data, bytes); + TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (data && param && param->data && param->bytes <= bytes) + { + TRACE("Copy %u bytes\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL b)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetString().
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: f3f59d2cf865c697f4c1c05b45e50ccdfded95db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f59d2cf865c697f4c1c05b4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 3 14:46:59 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetString(). --- dlls/d3dx9_36/effect.c | 168 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 154 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6373f1c..fcc3050 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -83,9 +83,11 @@ struct ID3DXBaseEffectImpl UINT parameter_count; UINT technique_count; + UINT object_count; D3DXHANDLE *parameter_handles; D3DXHANDLE *technique_handles; + D3DXHANDLE *objects; }; struct ID3DXEffectImpl @@ -292,11 +294,6 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) return; } - if (!child) - { - HeapFree(GetProcessHeap(), 0, param->data); - } - if (param->annotation_handles) { for (i = 0; i < param->annotation_count; ++i) @@ -320,6 +317,25 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) HeapFree(GetProcessHeap(), 0, param->member_handles); } + if (param->class == D3DXPC_OBJECT && !param->element_count) + { + switch(param->type) + { + case D3DXPT_STRING: + HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + } + + if (!child) + { + HeapFree(GetProcessHeap(), 0, param->data); + } + /* only the parent has to release name and semantic */ if (!element) { @@ -1251,10 +1267,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetString(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetString(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR *string) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, string %p stub\n", This, parameter, string); + TRACE("iface %p, parameter %p, string %p\n", This, parameter, string); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(LPCSTR *)param->data; + TRACE("Returning %s\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) @@ -2967,11 +2995,12 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; -static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) +static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, const char **ptr) { unsigned int i; HRESULT hr; UINT old_size = 0; + DWORD id; if (param->element_count) { @@ -2981,7 +3010,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size); + hr = d3dx9_parse_value(member, (char *)value + old_size, ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3010,7 +3039,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size); + hr = d3dx9_parse_value(member, (char *)value + old_size, ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3021,6 +3050,22 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) } break; + case D3DXPC_OBJECT: + switch (param->type) + { + case D3DXPT_STRING: + read_dword(ptr, &id); + TRACE("Id: %u\n", id); + param->base->objects[id] = get_parameter_handle(param); + param->data = value; + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -3029,12 +3074,11 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value) return D3D_OK; } - static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *ptr) { UINT size = param->bytes; HRESULT hr; - void *value; + void *value = NULL; TRACE("param size: %u\n", size); @@ -3048,7 +3092,7 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * TRACE("Data: %s.\n", debugstr_an(ptr, size)); memcpy(value, ptr, size); - hr = d3dx9_parse_value(param, value); + hr = d3dx9_parse_value(param, value, &ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3086,6 +3130,46 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } +static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) +{ + DWORD size; + HRESULT hr; + + TRACE("Parse data for parameter %s, type %s\n", debugstr_a(param->name), debug_d3dxparameter_type(param->type)); + + read_dword(ptr, &size); + TRACE("Data size: %#x\n", size); + + if (!size) + { + TRACE("Size is 0\n"); + *(void **)param->data = NULL; + return D3D_OK; + } + + switch (param->type) + { + case D3DXPT_STRING: + /* re-read with size (sizeof(DWORD) = 4) */ + hr = d3dx9_parse_name((LPSTR *)param->data, *ptr - 4); + if (hr != D3D_OK) + { + WARN("Failed to parse string data\n"); + return hr; + } + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + + + *ptr += ((size + 3) & ~3); + + return D3D_OK; +} + static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { @@ -3156,6 +3240,19 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch TRACE("Members: %u\n", param->member_count); break; + case D3DXPC_OBJECT: + switch (param->type) + { + case D3DXPT_STRING: + param->bytes = sizeof(LPCSTR); + break; + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; + } + break; + default: FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); break; @@ -3615,6 +3712,8 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * const char *ptr = data + start; D3DXHANDLE *parameter_handles = NULL; D3DXHANDLE *technique_handles = NULL; + D3DXHANDLE *objects = NULL; + unsigned int stringcount; HRESULT hr; unsigned int i; @@ -3624,7 +3723,20 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * read_dword(&ptr, &base->technique_count); TRACE("Technique count: %u\n", base->technique_count); - skip_dword_unknown(&ptr, 2); + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &base->object_count); + TRACE("Object count: %u\n", base->object_count); + + objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*objects) * base->object_count); + if (!objects) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + base->objects = objects; if (base->parameter_count) { @@ -3694,6 +3806,32 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * } } + read_dword(&ptr, &stringcount); + TRACE("String count: %u\n", stringcount); + + skip_dword_unknown(&ptr, 1); + + for (i = 0; i < stringcount; ++i) + { + DWORD id; + struct d3dx_parameter *param; + + read_dword(&ptr, &id); + TRACE("Id: %u\n", id); + + param = get_parameter_struct(base->objects[id]); + + hr = d3dx9_parse_data(param, &ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse data\n"); + goto err_out; + } + } + + HeapFree(GetProcessHeap(), 0, objects); + base->objects = NULL; + base->technique_handles = technique_handles; base->parameter_handles = parameter_handles; @@ -3719,6 +3857,8 @@ err_out: HeapFree(GetProcessHeap(), 0, parameter_handles); } + HeapFree(GetProcessHeap(), 0, objects); + return hr; }

1 0

Francois Gouget : winefile: Fix ellipsis usage in the menu and button labels.
by Alexandre Julliard 03 May '11

03 May '11

1 0

Francois Gouget : winecfg: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard 03 May '11

03 May '11

1 0

Francois Gouget : winhlp32: Fix the ellipsis usage in the menu and button labels.
by Alexandre Julliard 03 May '11

03 May '11

1 0

Francois Gouget : regedit: Fix ellipsis usage in the menu labels.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: d1e487f9400373706244712233b88739f5770f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e487f940037370624471223… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:41:17 2011 +0200 regedit: Fix ellipsis usage in the menu labels. --- po/ar.po | 20 +++++--------------- po/bg.po | 24 +++++++++--------------- po/ca.po | 22 +++++++--------------- po/cs.po | 24 +++++++++--------------- po/da.po | 22 ++++++++-------------- po/de.po | 22 ++++++++-------------- po/el.po | 19 +++++-------------- po/en.po | 22 +++++++--------------- po/en_US.po | 24 ++++++++---------------- po/eo.po | 20 +++++--------------- po/es.po | 24 +++++++++--------------- po/fa.po | 20 +++++--------------- po/fi.po | 20 +++++--------------- po/fr.po | 20 +++++++------------- po/he.po | 22 ++++++++-------------- po/hi.po | 18 +++++------------- po/hu.po | 21 +++++++-------------- po/it.po | 22 ++++++++-------------- po/ja.po | 22 ++++++++-------------- po/ko.po | 22 ++++++++-------------- po/lt.po | 22 ++++++++-------------- po/ml.po | 18 +++++------------- po/nb_NO.po | 22 ++++++++-------------- po/nl.po | 22 ++++++++-------------- po/or.po | 18 +++++------------- po/pa.po | 18 +++++------------- po/pl.po | 22 ++++++++-------------- po/pt_BR.po | 21 +++++++-------------- po/pt_PT.po | 22 ++++++++-------------- po/rm.po | 22 +++++++--------------- po/ro.po | 22 ++++++++-------------- po/ru.po | 22 ++++++++-------------- po/sk.po | 19 +++++-------------- po/sl.po | 22 ++++++++-------------- po/sr_RS(a)cyrillic.po | 20 +++++--------------- po/sr_RS(a)latin.po | 20 +++++--------------- po/sv.po | 22 ++++++++-------------- po/te.po | 18 +++++------------- po/th.po | 20 +++++--------------- po/tr.po | 22 ++++++++-------------- po/uk.po | 22 ++++++++-------------- po/wa.po | 23 +++++++---------------- po/wine.pot | 18 +++++------------- po/zh_CN.po | 22 ++++++++-------------- po/zh_TW.po | 22 ++++++++-------------- programs/regedit/regedit.rc | 12 ++++++------ 46 files changed, 317 insertions(+), 646 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1e487f94003737062447…

1 0

Francois Gouget : view: Fix ellipsis usage in the menus.
by Alexandre Julliard 03 May '11

03 May '11

1 0

Piotr Caban : msvcrt: Added _wtmpnam implementation.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 2a3484a22d6a2de286debb2b8934c28745a56f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3484a22d6a2de286debb2b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 14:26:08 2011 +0200 msvcrt: Added _wtmpnam implementation. --- dlls/msvcrt/file.c | 64 ++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c9ad136..84ec729 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,8 +88,10 @@ static int MSVCRT_stream_idx; /* INTERNAL: process umask */ static int MSVCRT_umask = 0; -/* INTERNAL: Static buffer for temp file name */ +/* INTERNAL: static data for tmpnam and _wtmpname functions */ +static int tmpnam_unique; static char MSVCRT_tmpname[MAX_PATH]; +static MSVCRT_wchar_t MSVCRT_wtmpname[MAX_PATH]; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; @@ -455,7 +457,7 @@ static void msvcrt_alloc_buffer(MSVCRT_FILE* file) } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ -static void msvcrt_int_to_base32(int num, char *str) +static int msvcrt_int_to_base32(int num, char *str) { char *p; int n = num; @@ -475,6 +477,33 @@ static void msvcrt_int_to_base32(int num, char *str) *p += ('a' - '0' - 10); num >>= 5; } + + return digits; +} + +/* INTERNAL: wide character version of msvcrt_int_to_base32 */ +static int msvcrt_int_to_base32_w(int num, MSVCRT_wchar_t *str) +{ + MSVCRT_wchar_t *p; + int n = num; + int digits = 0; + + while (n != 0) + { + n >>= 5; + digits++; + } + p = str + digits; + *p = 0; + while (--p >= str) + { + *p = (num & 31) + '0'; + if (*p > '9') + *p += ('a' - '0' - 10); + num >>= 5; + } + + return digits; } /********************************************************************* @@ -3336,18 +3365,17 @@ void CDECL MSVCRT_setbuf(MSVCRT_FILE* file, char *buf) */ char * CDECL MSVCRT_tmpnam(char *s) { - static int unique; char tmpstr[16]; char *p; - int count; + int count, size; if (s == 0) s = MSVCRT_tmpname; msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); p = s + sprintf(s, "\\s%s.", tmpstr); for (count = 0; count < MSVCRT_TMP_MAX; count++) { - msvcrt_int_to_base32(unique++, tmpstr); - strcpy(p, tmpstr); + size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); + memcpy(p, tmpstr, size); if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; @@ -3356,6 +3384,30 @@ char * CDECL MSVCRT_tmpnam(char *s) } /********************************************************************* + * _wtmpnam (MSVCRT.@) + */ +MSVCRT_wchar_t * MSVCRT_wtmpnam(MSVCRT_wchar_t *s) +{ + static const MSVCRT_wchar_t format[] = {'\\','s','%','s','.',0}; + MSVCRT_wchar_t tmpstr[16]; + MSVCRT_wchar_t *p; + int count, size; + if (s == 0) + s = MSVCRT_wtmpname; + msvcrt_int_to_base32_w(GetCurrentProcessId(), tmpstr); + p = s + MSVCRT__snwprintf(s, MAX_PATH, format, tmpstr); + for (count = 0; count < MSVCRT_TMP_MAX; count++) + { + size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); + memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); + if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && + GetLastError() == ERROR_FILE_NOT_FOUND) + break; + } + return s; +} + +/********************************************************************* * tmpfile (MSVCRT.@) */ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ca738d2..4e6333f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1192,7 +1192,7 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) # stub _wtempnam_dbg(wstr wstr long str long) -@ stub _wtmpnam(ptr) +@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l

1 0

Piotr Caban : msvcrt: Added _swprintf and vsnprintf functions.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 67b5a868f1017a15fe709abc48f43e80f5ca7c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b5a868f1017a15fe709abc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 3 14:26:23 2011 +0200 msvcrt: Added _swprintf and vsnprintf functions. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b157d60..727a496 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1170,7 +1170,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_c_l @ stub _swprintf_p diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 473883e..50960ca 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1024,7 +1024,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7ffa1c..bfd3583 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1010,7 +1010,7 @@ @ stub _strupr_s_l @ stub _strxfrm_l @ cdecl _swab(str str long) msvcrt._swab -@ stub _swprintf +@ varargs _swprintf(ptr wstr) msvcrt._swprintf @ stub _swprintf_c @ stub _swprintf_c_l @ stub _swprintf_p diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4e6333f..7a05dd9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -960,7 +960,7 @@ # stub _strupr_s_l(str long ptr) # stub _strxfrm_l(ptr str long ptr) @ cdecl _swab(str str long) MSVCRT__swab -# stub _swprintf(ptr str) +@ varargs _swprintf(ptr wstr) MSVCRT_swprintf # stub _swprintf_c(ptr long str) # stub _swprintf_c_l(ptr long str ptr) @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l @@ -1438,7 +1438,7 @@ @ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s @ cdecl vprintf(str ptr) MSVCRT_vprintf @ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s -# stub vsnprintf(ptr long str ptr) +@ cdecl vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf

1 0

Alexandre Julliard : msvcrt: Don't define stubs for data exports.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 3a1086a659b47dfeba4f175c90efaceda2103d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1086a659b47dfeba4f175c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 16:06:32 2011 +0200 msvcrt: Don't define stubs for data exports. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 727a496..e6b0365 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -411,7 +411,7 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -872,7 +872,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1326,7 +1326,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 69c0701..f728300 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -155,7 +155,7 @@ @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym @ cdecl __iscsymf(long) msvcrt.__iscsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle @@ -418,7 +418,7 @@ @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @@ -610,7 +610,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 -@ stub _wctype +# extern _wctype @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ff1f77b..47a2c17 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -150,7 +150,7 @@ @ cdecl __isascii(long) msvcrt.__isascii @ cdecl __iscsym(long) msvcrt.__iscsym @ cdecl __iscsymf(long) msvcrt.__iscsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle @@ -413,7 +413,7 @@ @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis @@ -606,7 +606,7 @@ @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 -@ stub _wctype +# extern _wctype @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 50960ca..3a3832c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -225,11 +225,11 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -718,7 +718,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1179,7 +1179,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bfd3583..a37a128 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -222,11 +222,11 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __lc_clike +# extern __lc_clike @ extern __lc_codepage msvcrt.__lc_codepage @ extern __lc_collate_cp msvcrt.__lc_collate_cp @ extern __lc_handle msvcrt.__lc_handle -@ stub __lconv +# extern __lconv @ cdecl __lconv_init() msvcrt.__lconv_init @ cdecl -arch=i386 __libm_sse2_acos() msvcrt.__libm_sse2_acos @ cdecl -arch=i386 __libm_sse2_acosf() msvcrt.__libm_sse2_acosf @@ -706,7 +706,7 @@ @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @ stub _mbbtype_l -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ stub _mbccpy_l @ stub _mbccpy_s @@ -1166,7 +1166,7 @@ @ stub _wctime64_s @ stub _wctomb_l @ stub _wctomb_s_l -@ stub _wctype +# extern _wctype @ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1531cd5..f598742 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -394,7 +394,7 @@ @ cdecl _malloc_dbg(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ cdecl _mbbtype(long long) msvcrt._mbbtype -@ stub _mbcasemap +# extern _mbcasemap @ cdecl _mbccpy(ptr str) msvcrt._mbccpy @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms @ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis

1 0