wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Jacek Caban : crypt32: Get rid of PWINECRYPT_CERTSTORE typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 0c4a2df240b25d4f14b96e787f602b06339282e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4a2df240b25d4f14b96e787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:51 2013 +0200 crypt32: Get rid of PWINECRYPT_CERTSTORE typedef. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/collectionstore.c | 25 +++++++-------- dlls/crypt32/crypt32_private.h | 22 +++++++------- dlls/crypt32/ctl.c | 4 +- dlls/crypt32/filestore.c | 14 ++++---- dlls/crypt32/provstore.c | 32 ++++++++++---------- dlls/crypt32/regstore.c | 6 ++-- dlls/crypt32/rootstore.c | 4 +- dlls/crypt32/store.c | 66 ++++++++++++++++++++-------------------- 9 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c4a2df240b25d4f14b96…

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_PROPERTY_LIST typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: d8c3ccee287880e8fb3be617063c0dacf8748b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c3ccee287880e8fb3be6170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:36 2013 +0200 crypt32: Get rid of PCONTEXT_PROPERTY_LIST typedef. --- dlls/crypt32/cert.c | 8 ++++---- dlls/crypt32/context.c | 6 +++--- dlls/crypt32/crl.c | 6 +++--- dlls/crypt32/crypt32_private.h | 23 +++++++++++------------ dlls/crypt32/ctl.c | 7 +++---- dlls/crypt32/msg.c | 2 +- dlls/crypt32/proplist.c | 21 ++++++++++----------- 7 files changed, 35 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c3ccee287880e8fb3be…

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_FUNCS typedef.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: ebaf4dd5a4001a31288bf965ff02162cfad22f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaf4dd5a4001a31288bf965f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:27 2013 +0200 crypt32: Get rid of PCONTEXT_FUNCS typedef. --- dlls/crypt32/collectionstore.c | 10 +++++----- dlls/crypt32/crypt32_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index d17c3b7..57a0513 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -88,11 +88,11 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, if (toReplace) { void *existingLinked = Context_GetLinkedContext(toReplace, contextSize); - PCONTEXT_FUNCS contextFuncs; + CONTEXT_FUNCS *contextFuncs; storeEntry = *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(toReplace, contextSize); - contextFuncs = (PCONTEXT_FUNCS)((LPBYTE)storeEntry->store + + contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, existingLinked, (const void **)&childContext); @@ -107,7 +107,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { - PCONTEXT_FUNCS contextFuncs = (PCONTEXT_FUNCS)( + CONTEXT_FUNCS *contextFuncs = (CONTEXT_FUNCS*)( (LPBYTE)entry->store + contextFuncsOffset); storeEntry = entry; @@ -168,8 +168,8 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, size_t offset = (const BYTE *)contextFuncs - (LPBYTE)storeEntry->store; PWINE_STORE_LIST_ENTRY storeNextEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry); - PCONTEXT_FUNCS storeNextContexts = - (PCONTEXT_FUNCS)((LPBYTE)storeNextEntry->store + offset); + CONTEXT_FUNCS *storeNextContexts = + (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, storeNextContexts, contextInterface, NULL, contextSize); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 94a3e52..e96d244 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -225,7 +225,7 @@ typedef struct _CONTEXT_FUNCS AddFunc addContext; EnumFunc enumContext; DeleteFunc deleteContext; -} CONTEXT_FUNCS, *PCONTEXT_FUNCS; +} CONTEXT_FUNCS; typedef enum _CertStoreType { StoreTypeMem,

1 0

Jacek Caban : crypt32: Get rid of P*WINE_CONTEXT_INTERFACE typedefs.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 9cee96bebfe32a7b7e95af66b41645f748a65973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cee96bebfe32a7b7e95af66b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:17 2013 +0200 crypt32: Get rid of P*WINE_CONTEXT_INTERFACE typedefs. --- dlls/crypt32/collectionstore.c | 2 +- dlls/crypt32/context.c | 4 ++-- dlls/crypt32/crypt32_private.h | 11 +++++------ dlls/crypt32/regstore.c | 2 +- dlls/crypt32/serialize.c | 2 +- dlls/crypt32/store.c | 6 +++--- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 6fe380c..d17c3b7 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -135,7 +135,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, */ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, PWINE_STORE_LIST_ENTRY storeEntry, const CONTEXT_FUNCS *contextFuncs, - PCWINE_CONTEXT_INTERFACE contextInterface, void *pPrev, size_t contextSize) + const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { void *ret, *child; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index bf4ccf3..1cfc03a 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -214,14 +214,14 @@ void Context_CopyProperties(const void *to, const void *from, struct ContextList { - PCWINE_CONTEXT_INTERFACE contextInterface; + const WINE_CONTEXT_INTERFACE *contextInterface; size_t contextSize; CRITICAL_SECTION cs; struct list contexts; }; struct ContextList *ContextList_Create( - PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize) + const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) { struct ContextList *list = CryptMemAlloc(sizeof(struct ContextList)); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index ea85cbc..94a3e52 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -194,12 +194,11 @@ typedef struct _WINE_CONTEXT_INTERFACE SerializeElementFunc serialize; FreeContextFunc free; DeleteContextFunc deleteFromStore; -} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE; -typedef const WINE_CONTEXT_INTERFACE *PCWINE_CONTEXT_INTERFACE; +} WINE_CONTEXT_INTERFACE; -extern PCWINE_CONTEXT_INTERFACE pCertInterface DECLSPEC_HIDDEN; -extern PCWINE_CONTEXT_INTERFACE pCRLInterface DECLSPEC_HIDDEN; -extern PCWINE_CONTEXT_INTERFACE pCTLInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN; +extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN; /* (Internal) certificate store types and functions */ struct WINE_CRYPTCERTSTORE; @@ -404,7 +403,7 @@ void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list) DECLSPEC_HIDDEN; struct ContextList; struct ContextList *ContextList_Create( - PCWINE_CONTEXT_INTERFACE contextInterface, size_t contextSize) DECLSPEC_HIDDEN; + const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index f4b4295..ccf37fc 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -349,7 +349,7 @@ static BOOL CRYPT_RegWriteContext(PWINE_REGSTOREINFO store, static BOOL CRYPT_RegDeleteContext(PWINE_REGSTOREINFO store, struct list *deleteList, const void *context, - PCWINE_CONTEXT_INTERFACE contextInterface) + const WINE_CONTEXT_INTERFACE *contextInterface) { BOOL ret; diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 7ca881c..59dde5a 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -41,7 +41,7 @@ typedef struct _WINE_CERT_PROP_HEADER static BOOL CRYPT_SerializeStoreElement(const void *context, const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, - PCWINE_CONTEXT_INTERFACE contextInterface, DWORD dwFlags, BOOL omitHashes, + const WINE_CONTEXT_INTERFACE *contextInterface, DWORD dwFlags, BOOL omitHashes, BYTE *pbElement, DWORD *pcbElement) { BOOL ret; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 6d27fc1..e0a9686 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -54,7 +54,7 @@ static const WINE_CONTEXT_INTERFACE gCertInterface = { (FreeContextFunc)CertFreeCertificateContext, (DeleteContextFunc)CertDeleteCertificateFromStore, }; -PCWINE_CONTEXT_INTERFACE pCertInterface = &gCertInterface; +const WINE_CONTEXT_INTERFACE *pCertInterface = &gCertInterface; static const WINE_CONTEXT_INTERFACE gCRLInterface = { (CreateContextFunc)CertCreateCRLContext, @@ -69,7 +69,7 @@ static const WINE_CONTEXT_INTERFACE gCRLInterface = { (FreeContextFunc)CertFreeCRLContext, (DeleteContextFunc)CertDeleteCRLFromStore, }; -PCWINE_CONTEXT_INTERFACE pCRLInterface = &gCRLInterface; +const WINE_CONTEXT_INTERFACE *pCRLInterface = &gCRLInterface; static const WINE_CONTEXT_INTERFACE gCTLInterface = { (CreateContextFunc)CertCreateCTLContext, @@ -84,7 +84,7 @@ static const WINE_CONTEXT_INTERFACE gCTLInterface = { (FreeContextFunc)CertFreeCTLContext, (DeleteContextFunc)CertDeleteCTLFromStore, }; -PCWINE_CONTEXT_INTERFACE pCTLInterface = &gCTLInterface; +const WINE_CONTEXT_INTERFACE *pCTLInterface = &gCTLInterface; typedef struct _WINE_MEMSTORE {

1 0

Nikolay Sivov : po: Tweak Russian strings for winecfg.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: b790abe9c6ac0e6c9a206b26ed8c4d5f82afaf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b790abe9c6ac0e6c9a206b26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 11:17:49 2013 +0400 po: Tweak Russian strings for winecfg. --- po/ru.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3bb7397..d0db94e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12633,8 +12633,8 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Wine может имитировать различные версии Windows для каждого приложения " -"отдельно. Эта вкладка связана с вкладками Библиотеки и Графика, что " -"позволяет изменение настроек в этих вкладках как для определённого " +"отдельно. Эта вкладка связана со вкладками Библиотеки и Графика, что " +"позволяет изменять настройки в этих вкладках как для определённого " "приложения, так и глобально." #: winecfg.rc:150 @@ -12671,7 +12671,7 @@ msgstr "&Эмулировать виртуальный рабочий стол" #: winecfg.rc:166 msgid "Desktop &size:" -msgstr "Размер рабочего стола:" +msgstr "&Рабочий стол:" #: winecfg.rc:171 msgid "Screen resolution" @@ -12679,7 +12679,7 @@ msgstr "Разрешение экрана" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "Пример текста (This is a sample text), шрифт Tahoma 10 пунктов" +msgstr "Пример текста, шрифт Tahoma 10 пунктов" #: winecfg.rc:182 msgid "DLL overrides" @@ -12764,7 +12764,7 @@ msgstr "&Путь:" #: winecfg.rc:239 winecfg.rc:35 msgid "Show &Advanced" -msgstr "Показать &дополнительные" +msgstr "&Дополнительно" #: winecfg.rc:240 msgid "De&vice:" @@ -12892,7 +12892,7 @@ msgstr "Выберите файл с темой" #: winecfg.rc:45 msgid "Folder" -msgstr "Стандартные папки" +msgstr "Папка" #: winecfg.rc:46 msgid "Links to"

1 0

Piotr Caban : winedump: Fix TLB function dumping.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 074941c04f4bb0f8a6198ca33bd3e18da8ef9c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=074941c04f4bb0f8a6198ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 4 09:09:44 2013 +0200 winedump: Fix TLB function dumping. --- tools/winedump/tlb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index a65c76e..73e384d 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -597,6 +597,8 @@ static void dump_msft_func(int n) print_hex("HelpStringContext"); if(extra_attr >= 7) print_hex("oCustData"); + for(i = 0; i < extra_attr-7; i++) + print_hex_id("oArgCustData", i); if(fkccic & 0x1000) { for(i=0; i < args_cnt; i++)

1 0

Henri Verbeet : d3dcompiler: Get rid of a couple of redundant casts.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: aab72562d56cb322377ed0825530d165d85300f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab72562d56cb322377ed0825… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:47 2013 +0200 d3dcompiler: Get rid of a couple of redundant casts. --- dlls/d3dcompiler_43/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0f61f61..221dad5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1688,7 +1688,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); if (name == type->name) @@ -1825,7 +1825,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls static int compare_function_decl_rb(const void *key, const struct wine_rb_entry *entry) { - const struct list *params = (const struct list *)key; + const struct list *params = key; const struct hlsl_ir_function_decl *decl = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); int params_count = params ? list_count(params) : 0; int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; @@ -1860,7 +1860,7 @@ static const struct wine_rb_functions hlsl_ir_function_decl_rb_funcs = static int compare_function_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_ir_function *func = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); return strcmp(name, func->name);

1 0

Henri Verbeet : d3dx9: Avoid LPVOID.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 871967d0fb4c3695cabd13a8669b513b5085c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871967d0fb4c3695cabd13a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:46 2013 +0200 d3dx9: Avoid LPVOID. --- dlls/d3dx9_36/core.c | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/effect.c | 12 +++++-- dlls/d3dx9_36/line.c | 6 ++-- dlls/d3dx9_36/mesh.c | 65 ++++++++++++++++++------------------- dlls/d3dx9_36/shader.c | 8 ++-- dlls/d3dx9_36/tests/mesh.c | 8 ++-- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/d3dx9_36/texture.c | 9 +++-- dlls/d3dx9_36/util.c | 2 +- include/d3dx9anim.h | 26 +++++++------- include/d3dx9core.h | 14 ++++---- include/d3dx9effect.h | 16 +++++----- include/d3dx9math.h | 2 +- include/d3dx9mesh.h | 44 +++++++++++++------------- include/d3dx9shader.h | 4 +- include/d3dx9tex.h | 6 ++- include/d3dx9xof.h | 15 +++++---- 19 files changed, 126 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=871967d0fb4c3695cabd1…

1 0

Henri Verbeet : wined3d: Don' t set WINED3DUSAGE_RENDERTARGET on the front buffer.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 6325f3ddd8d9922b49608b3afc096eaebada737d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6325f3ddd8d9922b49608b3af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:45 2013 +0200 wined3d: Don't set WINED3DUSAGE_RENDERTARGET on the front buffer. We never render directly to the front buffer, and in case of e.g. a P8 front buffer, we would fail surface creation if we were to enforce format restrictions. --- dlls/wined3d/swapchain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d1cb2f5..981d946 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -882,7 +882,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 surface_desc.format = swapchain->desc.backbuffer_format; surface_desc.multisample_type = swapchain->desc.multisample_type; surface_desc.multisample_quality = swapchain->desc.multisample_quality; - surface_desc.usage = WINED3DUSAGE_RENDERTARGET; + surface_desc.usage = 0; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = swapchain->desc.backbuffer_width; surface_desc.height = swapchain->desc.backbuffer_height; @@ -992,6 +992,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } + surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i);

1 0

Henri Verbeet : wined3d: Avoid a couple of useless glGetUniformLocationARB( ) calls.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 99092c2700d315136f79b2a96400f6900476fc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99092c2700d315136f79b2a96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:44 2013 +0200 wined3d: Avoid a couple of useless glGetUniformLocationARB() calls. --- dlls/wined3d/glsl_shader.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 280ec20..93ec2a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5754,18 +5754,20 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_vs_program *vs) + GLhandleARB program_id, struct glsl_vs_program *vs, unsigned int vs_c_count) { unsigned int i; char name[32]; vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + for (i = 0; i < vs_c_count; ++i) { snprintf(name, sizeof(name), "vs_c[%u]", i); vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&vs->uniform_f_locations[vs_c_count], 0xff, + (gl_info->limits.glsl_vs_float_constants - vs_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -5777,18 +5779,20 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_ps_program *ps) + GLhandleARB program_id, struct glsl_ps_program *ps, unsigned int ps_c_count) { unsigned int i; char name[32]; ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + for (i = 0; i < ps_c_count; ++i) { snprintf(name, sizeof(name), "ps_c[%u]", i); ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&ps->uniform_f_locations[ps_c_count], 0xff, + (gl_info->limits.glsl_ps_float_constants - ps_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -6002,8 +6006,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs, + vshader ? vshader->limits.constant_float : 0); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps, + pshader ? pshader->limits.constant_float : 0); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013