November 2009 - Wine-Commits

Hans Leidekker : msi: Unicode and ANSI global UI handlers are mutually exclusive.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 90fa4fe155ef4b3160f20655fd056043e3a6753a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fa4fe155ef4b3160f20655f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 2 10:03:39 2009 +0100 msi: Unicode and ANSI global UI handlers are mutually exclusive. --- dlls/msi/msi.c | 10 ++++++---- dlls/msi/tests/install.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8558a75..8b56705 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1905,8 +1905,9 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler, TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); gUIHandlerA = puiHandler; - gUIFilter = dwMessageFilter; - gUIContext = pvContext; + gUIHandlerW = NULL; + gUIFilter = dwMessageFilter; + gUIContext = pvContext; return prev; } @@ -1918,9 +1919,10 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler, TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); + gUIHandlerA = NULL; gUIHandlerW = puiHandler; - gUIFilter = dwMessageFilter; - gUIContext = pvContext; + gUIFilter = dwMessageFilter; + gUIContext = pvContext; return prev; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index badbb09..216ab97 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6871,6 +6871,39 @@ static void test_file_in_use_cab(void) delete_test_files(); } +INT CALLBACK handler_a(LPVOID context, UINT type, LPCSTR msg) { return IDOK; }; +INT CALLBACK handler_w(LPVOID context, UINT type, LPCWSTR msg) { return IDOK; }; + +static void test_MsiSetExternalUI(void) +{ + INSTALLUI_HANDLERA ret_a; + INSTALLUI_HANDLERW ret_w; + + ret_a = MsiSetExternalUIA(handler_a, INSTALLLOGMODE_ERROR, NULL); + ok(ret_a == NULL, "expected NULL, got %p\n", ret_a); + + ret_a = MsiSetExternalUIA(NULL, 0, NULL); + ok(ret_a == handler_a, "expected %p, got %p\n", handler_a, ret_a); + + ret_w = MsiSetExternalUIW(handler_w, INSTALLLOGMODE_ERROR, NULL); + ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); + + ret_w = MsiSetExternalUIW(NULL, 0, NULL); + ok(ret_w == handler_w, "expected %p, got %p\n", handler_w, ret_w); + + ret_a = MsiSetExternalUIA(handler_a, INSTALLLOGMODE_ERROR, NULL); + ok(ret_a == NULL, "expected NULL, got %p\n", ret_a); + + ret_w = MsiSetExternalUIW(handler_w, INSTALLLOGMODE_ERROR, NULL); + ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); + + ret_a = MsiSetExternalUIA(NULL, 0, NULL); + ok(ret_a == NULL, "expected NULL, got %p\n", ret_a); + + ret_w = MsiSetExternalUIW(NULL, 0, NULL); + ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); +} + START_TEST(install) { DWORD len; @@ -6959,6 +6992,7 @@ START_TEST(install) test_installed_prop(); test_file_in_use(); test_file_in_use_cab(); + test_MsiSetExternalUI(); DeleteFileA(log_file);

1 0

Rico Schüller : d3d10: Initialize *-> buffer for all effect variables.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: d5ac732ceb4d5640ed350644f84ece596cc79985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ac732ceb4d5640ed350644f… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:32 2009 +0100 d3d10: Initialize *->buffer for all effect variables. --- dlls/d3d10/effect.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 194f518..65ad689 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -921,11 +921,12 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co return E_OUTOFMEMORY; } - for(i = 0; i < p->annotation_count; ++i) + for (i = 0; i < p->annotation_count; ++i) { struct d3d10_effect_variable *a = &p->annotations[i]; a->effect = p->technique->effect; + a->buffer = &null_local_buffer; hr = parse_fx10_annotation(a, ptr, data); if (FAILED(hr)) return hr; @@ -980,11 +981,12 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return E_OUTOFMEMORY; } - for(i = 0; i < t->annotation_count; ++i) + for (i = 0; i < t->annotation_count; ++i) { struct d3d10_effect_variable *a = &t->annotations[i]; a->effect = t->effect; + a->buffer = &null_local_buffer; hr = parse_fx10_annotation(a, ptr, data); if (FAILED(hr)) return hr; @@ -1053,6 +1055,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * struct d3d10_effect_variable *a = &v->annotations[i]; a->effect = v->effect; + a->buffer = &null_local_buffer; hr = parse_fx10_annotation(a, ptr, data); if (FAILED(hr)) return hr; @@ -1142,6 +1145,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const struct d3d10_effect_variable *a = &v->annotations[i]; a->effect = v->effect; + a->buffer = &null_local_buffer; hr = parse_fx10_annotation(a, ptr, data); if (FAILED(hr)) return hr; @@ -1225,11 +1229,12 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch return E_OUTOFMEMORY; } - for(i = 0; i < l->annotation_count; ++i) + for (i = 0; i < l->annotation_count; ++i) { struct d3d10_effect_variable *a = &l->annotations[i]; a->effect = l->effect; + a->buffer = &null_local_buffer; hr = parse_fx10_annotation(a, ptr, data); if (FAILED(hr)) return hr; @@ -1443,6 +1448,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d v->effect = e; v->vtbl = &d3d10_effect_variable_vtbl; + v->buffer = &null_local_buffer; hr = parse_fx10_local_variable(v, &ptr, data); if (FAILED(hr)) return hr;

1 0

Jeremy White : advapi32/tests: Prevent test failure when computer name and user name are the same.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: e07e2ac3f7195fc3efcf46de489526dfcfec7710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07e2ac3f7195fc3efcf46de4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Nov 2 16:49:00 2009 -0600 advapi32/tests: Prevent test failure when computer name and user name are the same. --- dlls/advapi32/tests/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d226017..f610433 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2047,7 +2047,8 @@ static void test_LookupAccountName(void) domain = HeapAlloc(GetProcessHeap(), 0, domain_size); ret = LookupAccountNameA(NULL, computer_name, psid, &sid_size, domain, &domain_size, &sid_use); ok(ret, "LookupAccountNameA failed: %d\n", GetLastError()); - ok(sid_use == SidTypeDomain, "expected SidTypeDomain, got %d\n", sid_use); + ok(sid_use == SidTypeDomain || + (sid_use == SidTypeUser && ! strcmp(computer_name, user_name)), "expected SidTypeDomain for %s, got %d\n", computer_name, sid_use); HeapFree(GetProcessHeap(), 0, domain); HeapFree(GetProcessHeap(), 0, psid); }

1 0

Rico Schüller : d3d10/tests: Add effect variable type and class test.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: b8883547af70f8aa28234120a9614ccb79ceeb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8883547af70f8aa28234120a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:37 2009 +0100 d3d10/tests: Add effect variable type and class test. --- dlls/d3d10/tests/effect.c | 773 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 773 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8883547af70f8aa28234…

1 0

Hans Leidekker : msi: Implement MsiSetExternalUIRecord.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 808343fb5b5fd36fcd92c38def0ac1ca1010825f URL: http://source.winehq.org/git/wine.git/?a=commit;h=808343fb5b5fd36fcd92c38de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 2 10:04:05 2009 +0100 msi: Implement MsiSetExternalUIRecord. --- dlls/msi/media.c | 9 ++++++++- dlls/msi/msi.c | 19 +++++++++++++------ dlls/msi/msi_main.c | 13 +++++++------ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 9 ++++++++- dlls/msi/tests/install.c | 28 ++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 14 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index fe0192e..bc60b60 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -77,7 +77,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; if ((msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == - INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW) + INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS; error = generate_error_string(package, 1302, 1, mi->disk_prompt); @@ -98,6 +98,13 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) gUIHandlerA(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, msg); msi_free(msg); } + else if (gUIHandlerRecord) + { + MSIHANDLE rec = MsiCreateRecord(1); + MsiRecordSetStringW(rec, 0, error); + gUIHandlerRecord(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); + MsiCloseHandle(rec); + } } msi_free(error); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8b56705..2515714 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3595,13 +3595,20 @@ UINT WINAPI MsiIsProductElevatedA( LPCSTR szProduct, BOOL *pfElevated ) /*********************************************************************** * MsiSetExternalUIRecord [MSI.@] */ -UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD puiHandler, - DWORD dwMessageFilter, LPVOID pvContext, - PINSTALLUI_HANDLER_RECORD ppuiPrevHandler) +UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, + DWORD filter, LPVOID context, + PINSTALLUI_HANDLER_RECORD prev ) { - FIXME("%p %08x %p %p\n", puiHandler, dwMessageFilter ,pvContext, - ppuiPrevHandler); - return ERROR_CALL_NOT_IMPLEMENTED; + TRACE("%p %08x %p %p\n", handler, filter, context, prev); + + if (prev) + *prev = gUIHandlerRecord; + + gUIHandlerRecord = handler; + gUIFilter = filter; + gUIContext = context; + + return ERROR_SUCCESS; } /*********************************************************************** diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 9474b2a..df29184 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -37,12 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static LONG dll_count; /* the UI level */ -INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; -HWND gUIhwnd = 0; -INSTALLUI_HANDLERA gUIHandlerA = NULL; -INSTALLUI_HANDLERW gUIHandlerW = NULL; -DWORD gUIFilter = 0; -LPVOID gUIContext = NULL; +INSTALLUILEVEL gUILevel = INSTALLUILEVEL_BASIC; +HWND gUIhwnd = 0; +INSTALLUI_HANDLERA gUIHandlerA = NULL; +INSTALLUI_HANDLERW gUIHandlerW = NULL; +INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; +DWORD gUIFilter = 0; +LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; HINSTANCE msi_hInstance; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cfc3828..38103d8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -843,6 +843,7 @@ extern INSTALLUILEVEL gUILevel; extern HWND gUIhwnd; extern INSTALLUI_HANDLERA gUIHandlerA; extern INSTALLUI_HANDLERW gUIHandlerW; +extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord; extern DWORD gUIFilter; extern LPVOID gUIContext; extern WCHAR gszLogFile[MAX_PATH]; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 08a76f6..7f13633 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1203,7 +1203,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } } - TRACE("%p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, + TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord, gUIFilter, log_type, debugstr_w(message)); /* convert it to ASCII */ @@ -1219,6 +1219,13 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, { rc = gUIHandlerA( gUIContext, eMessageType, msg ); } + else if (gUIHandlerRecord && (gUIFilter & log_type)) + { + MSIHANDLE rec = MsiCreateRecord( 1 ); + MsiRecordSetStringW( rec, 0, message ); + rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); + MsiCloseHandle( rec ); + } if ((!rc) && (gszLogFile[0]) && !((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS)) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 216ab97..51e37e8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6873,11 +6873,14 @@ static void test_file_in_use_cab(void) INT CALLBACK handler_a(LPVOID context, UINT type, LPCSTR msg) { return IDOK; }; INT CALLBACK handler_w(LPVOID context, UINT type, LPCWSTR msg) { return IDOK; }; +INT CALLBACK handler_record(LPVOID context, UINT type, MSIHANDLE record) { return IDOK; }; static void test_MsiSetExternalUI(void) { INSTALLUI_HANDLERA ret_a; INSTALLUI_HANDLERW ret_w; + INSTALLUI_HANDLER_RECORD prev; + UINT error; ret_a = MsiSetExternalUIA(handler_a, INSTALLLOGMODE_ERROR, NULL); ok(ret_a == NULL, "expected NULL, got %p\n", ret_a); @@ -6885,6 +6888,15 @@ static void test_MsiSetExternalUI(void) ret_a = MsiSetExternalUIA(NULL, 0, NULL); ok(ret_a == handler_a, "expected %p, got %p\n", handler_a, ret_a); + error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); + ok(prev == NULL, "expected NULL, got %p\n", prev); + + prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; + error = MsiSetExternalUIRecord(NULL, INSTALLLOGMODE_ERROR, NULL, &prev); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); + ok(prev == handler_record, "expected %p, got %p\n", handler_record, prev); + ret_w = MsiSetExternalUIW(handler_w, INSTALLLOGMODE_ERROR, NULL); ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); @@ -6897,11 +6909,27 @@ static void test_MsiSetExternalUI(void) ret_w = MsiSetExternalUIW(handler_w, INSTALLLOGMODE_ERROR, NULL); ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); + prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; + error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, &prev); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); + ok(prev == NULL, "expected NULL, got %p\n", prev); + ret_a = MsiSetExternalUIA(NULL, 0, NULL); ok(ret_a == NULL, "expected NULL, got %p\n", ret_a); ret_w = MsiSetExternalUIW(NULL, 0, NULL); ok(ret_w == NULL, "expected NULL, got %p\n", ret_w); + + prev = (INSTALLUI_HANDLER_RECORD)0xdeadbeef; + error = MsiSetExternalUIRecord(NULL, 0, NULL, &prev); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); + ok(prev == handler_record, "expected %p, got %p\n", handler_record, prev); + + error = MsiSetExternalUIRecord(handler_record, INSTALLLOGMODE_ERROR, NULL, NULL); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); + + error = MsiSetExternalUIRecord(NULL, 0, NULL, NULL); + ok(!error, "MsiSetExternalUIRecord failed %u\n", error); } START_TEST(install)

1 0

Hans Leidekker : msi: Add support for the Unicode version of the global UI handler.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 4b5248c9e0bef0fe8cd94b871bb78f53c92fb6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5248c9e0bef0fe8cd94b871… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 2 10:03:14 2009 +0100 msi: Add support for the Unicode version of the global UI handler. --- dlls/msi/media.c | 14 ++++++++------ dlls/msi/msi.c | 6 ++++-- dlls/msi/package.c | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 06f14e0..fe0192e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -70,7 +70,6 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) { - LPSTR msg; LPWSTR error, error_dialog; LPWSTR source_dir; UINT r = ERROR_SUCCESS; @@ -78,21 +77,24 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; if ((msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == - INSTALLUILEVEL_NONE && !gUIHandlerA) + INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW) return ERROR_SUCCESS; error = generate_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package, error_prop); source_dir = msi_dup_property(package, cszSourceDir); - while (r == ERROR_SUCCESS && - !source_matches_volume(mi, source_dir)) + while (r == ERROR_SUCCESS && !source_matches_volume(mi, source_dir)) { r = msi_spawn_error_dialog(package, error_dialog, error); - if (gUIHandlerA) + if (gUIHandlerW) { - msg = strdupWtoA(error); + gUIHandlerW(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, error); + } + else if (gUIHandlerA) + { + char *msg = strdupWtoA(error); gUIHandlerA(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, msg); msi_free(msg); } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 14f8f13..8558a75 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1902,7 +1902,8 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler, { INSTALLUI_HANDLERA prev = gUIHandlerA; - TRACE("%p %x %p\n",puiHandler, dwMessageFilter,pvContext); + TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); + gUIHandlerA = puiHandler; gUIFilter = dwMessageFilter; gUIContext = pvContext; @@ -1915,7 +1916,8 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler, { INSTALLUI_HANDLERW prev = gUIHandlerW; - TRACE("%p %x %p\n",puiHandler,dwMessageFilter,pvContext); + TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); + gUIHandlerW = puiHandler; gUIFilter = dwMessageFilter; gUIContext = pvContext; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 13091d9..08a76f6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1203,19 +1203,21 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } } - TRACE("(%p %x %x %s)\n", gUIHandlerA, gUIFilter, log_type, - debugstr_w(message)); + TRACE("%p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, + gUIFilter, log_type, debugstr_w(message)); /* convert it to ASCII */ - len = WideCharToMultiByte( CP_ACP, 0, message, -1, - NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); - WideCharToMultiByte( CP_ACP, 0, message, -1, - msg, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerA && (gUIFilter & log_type)) + if (gUIHandlerW && (gUIFilter & log_type)) { - rc = gUIHandlerA(gUIContext,eMessageType,msg); + rc = gUIHandlerW( gUIContext, eMessageType, message ); + } + else if (gUIHandlerA && (gUIFilter & log_type)) + { + rc = gUIHandlerA( gUIContext, eMessageType, msg ); } if ((!rc) && (gszLogFile[0]) && !((eMessageType & 0xff000000) == @@ -1234,8 +1236,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, } } msi_free( msg ); - - msi_free( message); + msi_free( message ); switch (eMessageType & 0xff000000) {

1 0

Juan Lang : crypt32: Add stub for CryptGetIntendedKeyUsage.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: ed701e078700919edcb37baa2e03b1a6bdcba06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed701e078700919edcb37baa2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 15:41:58 2009 -0800 crypt32: Add stub for CryptGetIntendedKeyUsage. --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 2 +- include/wincrypt.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f88cf95..cb1b973 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2197,6 +2197,14 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV_LEGACY hCryptProv, return ret; } +BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, + PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage) +{ + FIXME("(%08x, %p, %p, %d)\n", dwCertEncodingType, pCertInfo, pbKeyUsage, + cbKeyUsage); + return FALSE; +} + BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index bcab030..ce427bd 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -57,7 +57,7 @@ @ stdcall CertGetCertificateChain(ptr ptr ptr ptr ptr long ptr ptr) @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr) @ stdcall CertGetEnhancedKeyUsage(ptr long ptr ptr) -@ stub CertGetIntendedKeyUsage +@ stdcall CertGetIntendedKeyUsage(long ptr ptr long) @ stdcall CertGetIssuerCertificateFromStore(long ptr ptr ptr) @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) diff --git a/include/wincrypt.h b/include/wincrypt.h index e9fbef0..32b523d 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4140,6 +4140,9 @@ BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext, BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement); +BOOL WINAPI CertGetIntendedKeyUsage(DWORD dwCertEncodingType, + PCERT_INFO pCertInfo, BYTE *pbKeyUsage, DWORD cbKeyUsage); + BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage); BOOL WINAPI CertSetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext,

1 0

Juan Lang : crypt32: Correct spec entries for certificate stores.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 1c7c406b865657d0321ef85dfcb78e16fafa5ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7c406b865657d0321ef85df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 16:16:29 2009 -0800 crypt32: Correct spec entries for certificate stores. --- dlls/crypt32/crypt32.spec | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index ce427bd..c144ea9 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -1,9 +1,9 @@ -@ stdcall CertAddCRLContextToStore(long ptr long ptr) -@ stdcall CertAddCTLContextToStore(long ptr long ptr) -@ stdcall CertAddCertificateContextToStore(long ptr long ptr) -@ stdcall CertAddEncodedCRLToStore(long long ptr long long ptr) -@ stdcall CertAddEncodedCTLToStore(long long ptr long long ptr) -@ stdcall CertAddEncodedCertificateToStore(long long ptr long long ptr) +@ stdcall CertAddCRLContextToStore(ptr ptr long ptr) +@ stdcall CertAddCTLContextToStore(ptr ptr long ptr) +@ stdcall CertAddCertificateContextToStore(ptr ptr long ptr) +@ stdcall CertAddEncodedCRLToStore(ptr long ptr long long ptr) +@ stdcall CertAddEncodedCTLToStore(ptr long ptr long long ptr) +@ stdcall CertAddEncodedCertificateToStore(ptr long ptr long long ptr) @ stub CertAddEncodedCertificateToSystemStoreA @ stub CertAddEncodedCertificateToSystemStoreW @ stdcall CertAddEnhancedKeyUsageIdentifier(ptr str) @@ -15,7 +15,7 @@ @ stdcall CertCompareCertificateName(long ptr ptr) @ stdcall CertCompareIntegerBlob(ptr ptr) @ stdcall CertComparePublicKeyInfo(long ptr ptr) -@ stdcall CertControlStore(long long long ptr) +@ stdcall CertControlStore(ptr long long ptr) @ stdcall CertCreateCRLContext(long ptr long) @ stdcall CertCreateCTLContext(long ptr long) @ stdcall CertCreateCertificateChainEngine(ptr ptr) @@ -35,13 +35,13 @@ @ stdcall CertEnumCTLContextProperties(ptr long) @ stdcall CertEnumCTLsInStore(ptr ptr) @ stdcall CertEnumCertificateContextProperties(ptr long) -@ stdcall CertEnumCertificatesInStore(long ptr) +@ stdcall CertEnumCertificatesInStore(ptr ptr) @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) -@ stdcall CertFindCRLInStore(long long long long ptr ptr) -@ stdcall CertFindCTLInStore(long long long long ptr ptr) -@ stdcall CertFindCertificateInStore(long long long long ptr ptr) +@ stdcall CertFindCRLInStore(ptr long long long ptr ptr) +@ stdcall CertFindCTLInStore(ptr long long long ptr ptr) +@ stdcall CertFindCertificateInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInCRL(ptr ptr long ptr ptr) @ stdcall CertFindExtension(str long ptr) @ stdcall CertFindRDNAttr(str ptr) @@ -58,11 +58,11 @@ @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr) @ stdcall CertGetEnhancedKeyUsage(ptr long ptr ptr) @ stdcall CertGetIntendedKeyUsage(long ptr ptr long) -@ stdcall CertGetIssuerCertificateFromStore(long ptr ptr ptr) +@ stdcall CertGetIssuerCertificateFromStore(ptr ptr ptr ptr) @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stdcall CertGetPublicKeyLength(long ptr) -@ stdcall CertGetStoreProperty(long long ptr ptr) +@ stdcall CertGetStoreProperty(ptr long ptr ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @@ -76,8 +76,8 @@ @ stdcall CertRDNValueToStrA(long ptr ptr long) @ stdcall CertRDNValueToStrW(long ptr ptr long) @ stdcall CertRemoveEnhancedKeyUsageIdentifier(ptr str) -@ stdcall CertRemoveStoreFromCollection(long long) -@ stdcall CertSaveStore(long long long long ptr long) +@ stdcall CertRemoveStoreFromCollection(ptr ptr) +@ stdcall CertSaveStore(ptr long long long ptr long) @ stdcall CertSerializeCRLStoreElement(ptr long ptr ptr) @ stdcall CertSerializeCTLStoreElement(ptr long ptr ptr) @ stdcall CertSerializeCertificateStoreElement(ptr long ptr ptr)

1 0

Rico Schüller : d3d10: Improve constant buffer stride and size_unpacked calculation.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: bd83a874b3261f3f990baaa4d18bd10344bc45d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd83a874b3261f3f990baaa4d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Nov 1 13:42:22 2009 +0100 d3d10: Improve constant buffer stride and size_unpacked calculation. --- dlls/d3d10/effect.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index db66806..194f518 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1156,6 +1156,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch DWORD offset; D3D10_CBUFFER_TYPE d3d10_cbuffer_type; HRESULT hr; + unsigned int stride = 0; /* Generate our own type, it isn't in the fx blob. */ l->type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*l->type)); @@ -1283,9 +1284,49 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch TRACE("Variable buffer offset: %u.\n", typem->buffer_offset); l->type->size_packed += v->type->size_packed; - l->type->size_unpacked += v->type->size_unpacked; + + /* + * For the complete constantbuffer the size_unpacked = stride, + * the stride is calculated like this: + * + * 1) if the constant buffer variables are packed with packoffset + * - stride = the highest used constant + * - the complete stride has to be a multiple of 0x10 + * + * 2) if the constant buffer variables are NOT packed with packoffset + * - sum of unpacked size for all variables which fit in a 0x10 part + * - if the size exceeds a 0x10 part, the rest of the old part is skipped + * and a new part is started + * - if the variable is a struct it is always used a new part + * - the complete stride has to be a multiple of 0x10 + * + * e.g.: + * 0x4, 0x4, 0x4, 0x8, 0x4, 0x14, 0x4 + * part 0x10 0x10 0x20 -> 0x40 + */ + if (v->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + { + if ((v->type->size_unpacked + v->buffer_offset) > stride) + { + stride = v->type->size_unpacked + v->buffer_offset; + } + } + else + { + if (v->type->type_class == D3D10_SVC_STRUCT) + { + stride = (stride + 0xf) & ~0xf; + } + + if ( ((stride & 0xf) + v->type->size_unpacked) > 0x10) + { + stride = (stride + 0xf) & ~0xf; + } + + stride += v->type->size_unpacked; + } } - l->type->stride = l->type->size_unpacked = (l->type->size_unpacked + 0xf) & ~0xf; + l->type->stride = l->type->size_unpacked = (stride + 0xf) & ~0xf; TRACE("Constant buffer:\n"); TRACE("\tType name: %s.\n", debugstr_a(l->type->name));

1 0

Vincent Povirk : ole32: Remove uses of This->base. ancestorStorage in createDirEntry.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 4e4810f2c55a561b048734beedcb7d4483e7b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4810f2c55a561b048734bee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 15:01:32 2009 -0500 ole32: Remove uses of This->base.ancestorStorage in createDirEntry. --- dlls/ole32/storage32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 66cbf92..68ca23a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1166,7 +1166,7 @@ static HRESULT createDirEntry( do { - hr = StorageImpl_ReadRawDirEntry(storage->base.ancestorStorage, + hr = StorageImpl_ReadRawDirEntry(storage, currentPropertyIndex, currentData); @@ -1211,7 +1211,7 @@ static HRESULT createDirEntry( * obtain the new count of property blocks */ blockCount = BlockChainStream_GetCount( - storage->base.ancestorStorage->rootBlockChain)+1; + storage->rootBlockChain)+1; /* * initialize the size used by the property stream @@ -1222,7 +1222,7 @@ static HRESULT createDirEntry( /* * add a property block to the property chain */ - BlockChainStream_SetSize(storage->base.ancestorStorage->rootBlockChain, newSize); + BlockChainStream_SetSize(storage->rootBlockChain, newSize); /* * memset the empty property in order to initialize the unused newly @@ -1241,7 +1241,7 @@ static HRESULT createDirEntry( propertyIndex++) { StorageImpl_WriteRawDirEntry( - storage->base.ancestorStorage, + storage, propertyIndex, emptyData); }

1 0