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

Francois Gouget : mshtml: Remove spaces before '\n' s in the Portuguese translation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: bd43ffec6a07749a0a3eee4e84d5ed6cfab1c90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd43ffec6a07749a0a3eee4e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 27 12:20:58 2010 +0200 mshtml: Remove spaces before '\n's in the Portuguese translation. --- dlls/mshtml/Pt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 4987452..478272f 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -51,7 +51,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "O Wine não pôde encontrar o pacote Gecko que é necessário para aplicações com HTML embutido " \ "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo para você.\n\n" \ - "Nota: é recomendável usar os pacotes da sua distribuição ao invés disso. \n\ + "Nota: é recomendável usar os pacotes da sua distribuição ao invés disso.\n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 @@ -68,7 +68,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "O Wine não conseguiu encontrar o pacote Gecko que é necessário para aplicações com HTML embutido " \ "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo por si.\n\n" \ - "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. \n\ + "Nota: é recomendável usar os pacotes da sua distribuição em vez disso.\n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12

1 0

Francois Gouget : appwiz.cpl: Remove a space before an ellipsis in the Norwegian translation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 7e352cc2c67089525ec6a5f801549e266b375649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e352cc2c67089525ec6a5f80… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 27 12:21:11 2010 +0200 appwiz.cpl: Remove a space before an ellipsis in the Norwegian translation. --- dlls/appwiz.cpl/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 1abc0cb..fcf8745 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Installasjonsprogrammer\0*instal*.exe;*setup*.exe;*.msi\0Programmer (*.exe)\0*.exe\0Alle filer (*.*)\0*.*\0\0" IDS_REMOVE, "Fje&rn..." - IDS_MODIFY_REMOVE, "&Endre/Fjern ..." + IDS_MODIFY_REMOVE, "&Endre/Fjern..." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Francois Gouget : shdoclc: Remove a space before an ellipsis in the Italian translation.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 6456fe50c0c09fa9bcd61f98d9f474d9f39230fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6456fe50c0c09fa9bcd61f98d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 27 12:21:01 2010 +0200 shdoclc: Remove a space before an ellipsis in the Italian translation. --- dlls/shdoclc/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/It.rc b/dlls/shdoclc/It.rc index d7d749e..b97b703 100644 --- a/dlls/shdoclc/It.rc +++ b/dlls/shdoclc/It.rc @@ -72,7 +72,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "&Mostra immagine", IDM_SHOWPICTURE MENUITEM "Salva immagi&ne come...", IDM_SAVEPICTURE - MENUITEM "Invia immagine tramite &e-mail ...", IDM_MP_EMAILPICTURE + MENUITEM "Invia immagine tramite &e-mail...", IDM_MP_EMAILPICTURE MENUITEM "S&tampa immagine...", IDM_MP_PRINTPICTURE MENUITEM "&Vai a Immagini", IDM_MP_MYPICS MENUITEM "Im&posta come sfondo", IDM_SETWALLPAPER

1 0

Alexandre Julliard : widl: Fix parsing of function calling conventions.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 7d2869457f4198aa09e92a692e6e64cbd4968270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2869457f4198aa09e92a692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 13:49:56 2010 +0200 widl: Fix parsing of function calling conventions. --- tools/widl/parser.y | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index db071a7..1900d77 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -926,7 +926,8 @@ decl_spec_no_type: declarator: '*' m_type_qual_list declarator %prec PPTR { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } - | callconv declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + | callconv declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); + else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } | direct_declarator ; @@ -944,7 +945,8 @@ direct_declarator: abstract_declarator: '*' m_type_qual_list m_abstract_declarator %prec PPTR { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } - | callconv m_abstract_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + | callconv m_abstract_declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); + else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } | abstract_direct_declarator ; @@ -952,7 +954,8 @@ abstract_declarator: abstract_declarator_no_direct: '*' m_type_qual_list m_any_declarator %prec PPTR { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } - | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + | callconv m_any_declarator { $$ = $2; if ($$->func_type) $$->func_type->attrs = append_attr($$->func_type->attrs, make_attrp(ATTR_CALLCONV, $1)); + else if ($$->type) $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } ; /* abstract declarator or empty */

1 0

Alexandre Julliard : widl: Set the default calling convention at header generation time, not at parsing time.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: c6668089a494492e0b5f9d28b878fbd02a1cea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6668089a494492e0b5f9d28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 13:52:09 2010 +0200 widl: Set the default calling convention at header generation time, not at parsing time. --- tools/widl/header.c | 17 +++++++++++------ tools/widl/header.h | 1 - tools/widl/parser.y | 11 +---------- tools/widl/proxy.c | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 91ea2a0..b9b750a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -39,10 +39,13 @@ typedef struct _user_type_t generic_handle_t; static int indentation = 0; +static int is_object_interface = 0; user_type_list_t user_type_list = LIST_INIT(user_type_list); static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); static struct list generic_handle_list = LIST_INIT(generic_handle_list); +static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name); + static void indent(FILE *h, int delta) { int c; @@ -366,12 +369,12 @@ static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const c if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { int i; const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv && is_object_interface) callconv = "STDMETHODCALLTYPE"; if (is_attr(pt->attrs, ATTR_INLINE)) fprintf(h, "inline "); write_type_left(h, type_function_get_rettype(pt), declonly); fputc(' ', h); if (ptr_level) fputc('(', h); - fprintf(h, "%s ", callconv); + if (callconv) fprintf(h, "%s ", callconv); for (i = 0; i < ptr_level; i++) fputc('*', h); } else @@ -396,7 +399,7 @@ static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const c } } -void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) +static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) { write_type_v(f, t, field, FALSE, name); } @@ -785,7 +788,7 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); fprintf(header, "virtual "); write_type_decl_left(header, type_function_get_rettype(func->type)); @@ -815,7 +818,7 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char } if (!is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); @@ -846,7 +849,7 @@ static void write_method_proto(FILE *header, const type_t *iface) if (!is_local(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; /* proxy prototype */ write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(func)); @@ -1217,6 +1220,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; + if (is_object(iface)) is_object_interface++; if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { write_com_interface_start(header, iface); @@ -1229,6 +1233,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_header_stmts(header, type_iface_get_stmts(iface), iface, FALSE); write_rpc_interface_end(header, iface); } + if (is_object(iface)) is_object_interface++; } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass(header, stmt->u.type); diff --git a/tools/widl/header.h b/tools/widl/header.h index 97a2726..2175f5e 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -34,7 +34,6 @@ extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); -extern void write_type_def_or_decl(FILE *h, type_t *t, int is_field, const char *name); extern void write_type_decl(FILE *f, type_t *t, const char *name); extern void write_type_decl_left(FILE *f, type_t *t); extern int needs_space_after(type_t *t); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1900d77..5b4c823 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -66,7 +66,6 @@ #define YYERROR_VERBOSE static unsigned char pointer_default = RPC_FC_UP; -static int is_object_interface = FALSE; typedef struct list typelist_t; struct typenode { @@ -806,7 +805,6 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, 0) ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; - is_object_interface = TRUE; $$ = $2; check_def($$); attrs = make_attr(ATTR_DISPINTERFACE); @@ -836,7 +834,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); is_object_interface = 1; } + | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, 0); } @@ -849,7 +847,6 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); check_def($2); $2->attrs = check_iface_attrs($2->name, $1); - is_object_interface = is_object($2); $2->defined = TRUE; } ; @@ -1575,12 +1572,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl * function node */ for (t = v->type; is_ptr(t); t = type_pointer_get_ref(t)) ft->attrs = move_attr(ft->attrs, t->attrs, ATTR_CALLCONV); - if (is_object_interface && !is_attr(ft->attrs, ATTR_CALLCONV)) - { - static char *stdmethodcalltype; - if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); - ft->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); - } } else { diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 30feca8..8cbdf8f 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -280,7 +280,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, int has_ret = !is_void(type_function_get_rettype(func->type)); int has_full_pointer = is_full_pointer_function(func); const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; + if (!callconv) callconv = "STDMETHODCALLTYPE"; indent = 0; print_proxy( "static void __finally_%s_%s_Proxy( struct __proxy_frame *__frame )\n",

1 0

Alexandre Julliard : include: Specify calling convention explicitly in idl files where needed.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: a919735870c38f2c18748427394a593c60ee18e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a919735870c38f2c187484273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 13:53:17 2010 +0200 include: Specify calling convention explicitly in idl files where needed. --- include/dxgi.idl | 2 +- include/wine/wined3d.idl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index b67674e..8a7b092 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -329,7 +329,7 @@ interface IDXGIFactory : IDXGIObject ); } -[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory); +[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory); [ object, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b6e73ec..62810db 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2107,7 +2107,7 @@ struct wined3d_shader_signature struct wined3d_parent_ops { - void (*wined3d_object_destroyed)(void *parent); + void (__stdcall *wined3d_object_destroyed)(void *parent); }; interface IWineD3DResource; @@ -2177,8 +2177,8 @@ interface IWineD3DDeviceParent : IUnknown [out] IWineD3DSwapChain **swapchain ); } -typedef ULONG (*D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); -typedef HRESULT (*D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData); +typedef ULONG (__stdcall *D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); +typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData); [ object, @@ -3399,7 +3399,7 @@ interface IWineD3DDevice : IWineD3DBase ); } -IWineD3D *WineDirect3DCreate(UINT dxVersion, IUnknown *parent); -IWineD3DClipper *WineDirect3DCreateClipper(IUnknown *parent); -void wined3d_mutex_lock(void); -void wined3d_mutex_unlock(void); +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, IUnknown *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(IUnknown *parent); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void);

1 0

Huw Davies : shell32: Add a few printer icon resource ids.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 3e9f0ca2270bb91e07b0c24ec584d92bba32f5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9f0ca2270bb91e07b0c24ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 13:13:49 2010 +0100 shell32: Add a few printer icon resource ids. --- dlls/shell32/shresdef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 88c93c8..b8a456b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -174,8 +174,13 @@ #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_REMOTE_PRINTER 140 +#define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_CONFIRM_DELETE 161 +#define IDI_SHELL_DEFAULT_PRINTER 168 +#define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 +#define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_MY_DOCUMENTS 235 /*

1 0

Alexandre Julliard : mscoree/tests: Comment out a couple of tests that crash on Windows.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 67d0195fd9070660c5342edeee4f17482933a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d0195fd9070660c5342edee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 15:17:29 2010 +0200 mscoree/tests: Comment out a couple of tests that crash on Windows. --- dlls/mscoree/tests/mscoree.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 59ba58e..0536ba1 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -60,8 +60,11 @@ static void test_versioninfo(void) DWORD size, path_len; HRESULT hr; - hr = pGetCORVersion(NULL, MAX_PATH, &size); - ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + if (0) /* crashes on <= w2k3 */ + { + hr = pGetCORVersion(NULL, MAX_PATH, &size); + ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + } hr = pGetCORVersion(version, 1, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); @@ -81,8 +84,11 @@ static void test_versioninfo(void) hr = pGetCORSystemDirectory(path, path_len-1 , &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); - hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + if (0) /* crashes on <= w2k3 */ + { + hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + } hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr);

1 0

Hans Leidekker : msi/tests: Use a different product code in the package tests to avoid cascading test failures .
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 137dfbe80a5cc42b2c6214124144cbc431b79bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137dfbe80a5cc42b2c6214124… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:49:31 2010 +0200 msi/tests: Use a different product code in the package tests to avoid cascading test failures. --- dlls/msi/tests/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9e7f104..f9d6a63 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2478,7 +2478,7 @@ static void test_states(void) r = create_property_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create Property table: %d\n", r ); - r = add_property_entry( hdb, "'ProductCode', '{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}'" ); + r = add_property_entry( hdb, "'ProductCode', '{7262AC98-EEBD-4364-8CE3-D654F6A425B9}'" ); ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r ); r = add_property_entry( hdb, "'ProductLanguage', '1033'" );

1 0

Hans Leidekker : msi: Create the product key if necessary in msi_publish_patches.
by Alexandre Julliard 27 Aug '10

27 Aug '10

Module: wine Branch: master Commit: 44b15b061b22d0929019b2831ea83ba3762c32b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b15b061b22d0929019b2831… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 27 10:49:55 2010 +0200 msi: Create the product key if necessary in msi_publish_patches. Fixes a regression caused by c9fb24927db773905e144db63d9e34741e97f703. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bb559c0..5eb4ae8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3891,7 +3891,7 @@ static UINT msi_publish_patches( MSIPACKAGE *package ) WCHAR *p, *all_patches = NULL; DWORD len = 0; - r = MSIREG_OpenProductKey( package->ProductCode, NULL, package->Context, &product_key, FALSE ); + r = MSIREG_OpenProductKey( package->ProductCode, NULL, package->Context, &product_key, TRUE ); if (r != ERROR_SUCCESS) return ERROR_FUNCTION_FAILED;

1 0