wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Rob Shearman : advapi32: Runtime link to CreateWellKnownSid in the tests for the function, since it isn't available on all platforms.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 8bfb77b95844b4d4df5c72c377ebacbc5184d461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfb77b95844b4d4df5c72c37… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 13:38:27 2007 +0100 advapi32: Runtime link to CreateWellKnownSid in the tests for the function, since it isn't available on all platforms. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9cf409e..7f5728e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1143,7 +1143,7 @@ static void test_CreateWellKnownSid() } cb = sizeof(sid_buffer); - ok(CreateWellKnownSid(i, value->without_domain ? NULL : domainsid, sid_buffer, &cb), "Couldn't create well known sid %d\n", i); + ok(pCreateWellKnownSid(i, value->without_domain ? NULL : domainsid, sid_buffer, &cb), "Couldn't create well known sid %d\n", i); expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); ok(ConvertSidToStringSid(sid_buffer, &str), "Couldn't convert SID to string\n"); @@ -1155,7 +1155,7 @@ static void test_CreateWellKnownSid() { char buf2[SECURITY_MAX_SID_SIZE]; cb = sizeof(buf2); - ok(CreateWellKnownSid(i, domainsid, buf2, &cb), "Couldn't create well known sid %d with optional domain\n", i); + ok(pCreateWellKnownSid(i, domainsid, buf2, &cb), "Couldn't create well known sid %d with optional domain\n", i); expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(memcmp(buf2, sid_buffer, cb) == 0, "SID create with domain is different than without (%d)\n", i); }

1 0

Rob Shearman : ntdll: Allow the newer ACL revisions in RtlCreateAce.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 6bc11536bda7e4190a17c41a6699c1495c8b0c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc11536bda7e4190a17c41a6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 13:38:07 2007 +0100 ntdll: Allow the newer ACL revisions in RtlCreateAce. --- dlls/ntdll/sec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 89d23df..f195678 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1066,7 +1066,7 @@ NTSTATUS WINAPI RtlCreateAcl(PACL acl,DWORD size,DWORD rev) { TRACE("%p 0x%08x 0x%08x\n", acl, size, rev); - if (rev!=ACL_REVISION) + if (rev < MIN_ACL_REVISION || rev > MAX_ACL_REVISION) return STATUS_INVALID_PARAMETER; if (size<sizeof(ACL)) return STATUS_BUFFER_TOO_SMALL;

1 0

Jacek Caban : urlmon: Added application/postscript MIME filter.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: f9545ad94fcbcf47b18a67b525eb613137cabe32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9545ad94fcbcf47b18a67b52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 12:53:49 2007 +0200 urlmon: Added application/postscript MIME filter. --- dlls/urlmon/tests/misc.c | 10 +++++++++- dlls/urlmon/urlmon_main.c | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 3e55b62..9f33f73 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -362,6 +362,8 @@ static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR mimeVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR mimeVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR mimeAppPostscript[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; static const WCHAR mimeAppXCompressed[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'x','-','c','o','m','p','r','e','s','s','e','d',0}; static const WCHAR mimeAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -466,6 +468,9 @@ static BYTE data75[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V','E',0xff static BYTE data76[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V','E'}; static BYTE data77[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V',0xff,0xff}; static BYTE data78[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'<','h','t','m','l','>',0xff}; +static BYTE data79[] = {'%','!',0xff}; +static BYTE data80[] = {'%','!'}; +static BYTE data81[] = {'%','!','P','S','<','h','t','m','l','>'}; static const struct { BYTE *data; @@ -549,7 +554,10 @@ static const struct { {data75, sizeof(data75), mimeAudioWav}, {data76, sizeof(data76), mimeTextPlain}, {data77, sizeof(data77), mimeTextPlain}, - {data78, sizeof(data78), mimeTextHtml} + {data78, sizeof(data78), mimeTextHtml}, + {data79, sizeof(data79), mimeAppPostscript}, + {data80, sizeof(data80), mimeTextPlain}, + {data81, sizeof(data81), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 51977ad..a8c2d5a 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -487,6 +487,11 @@ static BOOL video_mpeg_filter(const BYTE *b, DWORD size) && (b[3] == 0xb3 || b[3] == 0xba); } +static BOOL application_postscript_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == '%' && b[1] == '!'; +} + static BOOL application_pdf_filter(const BYTE *b, DWORD size) { return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; @@ -579,6 +584,8 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszVideoAvi[] = {'v','i','d','e','o','/','a','v','i',0}; static const WCHAR wszVideoMpeg[] = {'v','i','d','e','o','/','m','p','e','g',0}; + static const WCHAR wszAppPostscript[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; static const WCHAR wszAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'p','d','f',0}; static const WCHAR wszAppXZip[] = {'a','p','p','l','i','c','a','t','i','o','n','/', @@ -607,6 +614,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, {wszImageBmp, image_bmp_filter}, {wszVideoAvi, video_avi_filter}, {wszVideoMpeg, video_mpeg_filter}, + {wszAppPostscript, application_postscript_filter}, {wszAppPdf, application_pdf_filter}, {wszAppXZip, application_xzip_filter}, {wszAppXGzip, application_xgzip_filter},

1 0

Jacek Caban : urlmon: Added audio/wav MIME filter.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 58e8b19d0bd312b27679e3a978aaf987ca61c8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e8b19d0bd312b27679e3a97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 12:53:29 2007 +0200 urlmon: Added audio/wav MIME filter. --- dlls/urlmon/tests/misc.c | 20 ++++++++++++++++++-- dlls/urlmon/urlmon_main.c | 9 +++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 9623fbe..3e55b62 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -62,6 +62,13 @@ DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -365,6 +372,7 @@ static const WCHAR mimeAppJava[] = {'a','p','p','l','i','c','a','t','i','o','n', static const WCHAR mimeAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; static const WCHAR mimeAppXMSDownload[] = {'a','p','p','l','i','c','a','t','i','o','n','/','x','-','m','s','d','o','w','n','l','o','a','d',0}; +static const WCHAR mimeAudioWav[] = {'a','u','d','i','o','/','w','a','v',0}; static const struct { LPCWSTR url; @@ -454,6 +462,10 @@ static BYTE data71[] = {'{','\\','r','t','f',0}; static BYTE data72[] = {'{','\\','r','t','f'}; static BYTE data73[] = {' ','{','\\','r','t','f',' '}; static BYTE data74[] = {'{','\\','r','t','f','<','h','t','m','l','>',' '}; +static BYTE data75[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V','E',0xff}; +static BYTE data76[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V','E'}; +static BYTE data77[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'W','A','V',0xff,0xff}; +static BYTE data78[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'<','h','t','m','l','>',0xff}; static const struct { BYTE *data; @@ -533,7 +545,11 @@ static const struct { {data71, sizeof(data71), mimeTextRichtext}, {data72, sizeof(data72), mimeTextPlain}, {data73, sizeof(data73), mimeTextPlain}, - {data74, sizeof(data74), mimeTextHtml} + {data74, sizeof(data74), mimeTextHtml}, + {data75, sizeof(data75), mimeAudioWav}, + {data76, sizeof(data76), mimeTextPlain}, + {data77, sizeof(data77), mimeTextPlain}, + {data78, sizeof(data78), mimeTextHtml} }; static void test_FindMimeFromData(void) @@ -573,7 +589,7 @@ static void test_FindMimeFromData(void) hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, NULL, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime: %s\n", i, debugstr_w(mime)); CoTaskMemFree(mime); hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 535b364..51977ad 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -432,6 +432,13 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) return FALSE; } +static BOOL audio_wav_filter(const BYTE *b, DWORD size) +{ + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'W' && b[9] == 'A' && b[10] == 'V' && b[11] == 'E'; +} + static BOOL image_gif_filter(const BYTE *b, DWORD size) { return size >= 6 @@ -564,6 +571,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; + static const WCHAR wszAudioWav[] = {'a','u','d','i','o','/','w','a','v',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR wszImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; @@ -591,6 +599,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, } mime_filters[] = { {wszTextHtml, text_html_filter}, {wszTextRichtext, text_richtext_filter}, + {wszAudioWav, audio_wav_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, {wszImageTiff, image_tiff_filter},

1 0

Jacek Caban : urlmon: Added text/richtext MIME filter.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: ec565fbfd93c141297ef2b6e45e3ecb07973b621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec565fbfd93c141297ef2b6e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 12:53:07 2007 +0200 urlmon: Added text/richtext MIME filter. --- dlls/urlmon/tests/misc.c | 11 ++++++++++- dlls/urlmon/urlmon_main.c | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index b6f6421..9623fbe 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -345,6 +345,7 @@ static void test_CoInternetCompareUrl(void) static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR mimeTextPlain[] = {'t','e','x','t','/','p','l','a','i','n',0}; +static const WCHAR mimeTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; static const WCHAR mimeAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m',0}; static const WCHAR mimeImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; @@ -449,6 +450,10 @@ static BYTE data67[] = {0x25,0x50,0x44,0x46,'x','<','h','t','m','l','>'}; static BYTE data68[] = {'M','Z','x'}; static BYTE data69[] = {'M','Z'}; static BYTE data70[] = {'M','Z','<','h','t','m','l','>',0xff}; +static BYTE data71[] = {'{','\\','r','t','f',0}; +static BYTE data72[] = {'{','\\','r','t','f'}; +static BYTE data73[] = {' ','{','\\','r','t','f',' '}; +static BYTE data74[] = {'{','\\','r','t','f','<','h','t','m','l','>',' '}; static const struct { BYTE *data; @@ -524,7 +529,11 @@ static const struct { {data67, sizeof(data67), mimeTextHtml}, {data68, sizeof(data68), mimeAppXMSDownload}, {data69, sizeof(data69), mimeTextPlain}, - {data70, sizeof(data70), mimeTextHtml} + {data70, sizeof(data70), mimeTextHtml}, + {data71, sizeof(data71), mimeTextRichtext}, + {data72, sizeof(data72), mimeTextPlain}, + {data73, sizeof(data73), mimeTextPlain}, + {data74, sizeof(data74), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a64d494..535b364 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -408,6 +408,10 @@ void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) pbindinfo->cbSize = size; } +static BOOL text_richtext_filter(const BYTE *b, DWORD size) +{ + return size > 5 && !memcmp(b, "{\\rtf", 5); +} static BOOL text_html_filter(const BYTE *b, DWORD size) { @@ -559,6 +563,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, int i; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + static const WCHAR wszTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; static const WCHAR wszImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; @@ -585,6 +590,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, BOOL (*filter)(const BYTE *,DWORD); } mime_filters[] = { {wszTextHtml, text_html_filter}, + {wszTextRichtext, text_richtext_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, {wszImageTiff, image_tiff_filter},

1 0

Luke Bratch : mshtml: Fix text input fields.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 7ce4194c796788036c1f97c6893e84581dd4b094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce4194c796788036c1f97c68… Author: Luke Bratch <l_bratch(a)yahoo.co.uk> Date: Tue Oct 23 10:22:13 2007 +0100 mshtml: Fix text input fields. --- dlls/mshtml/view.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e24fa77..e1f13dc 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -92,6 +92,7 @@ static void activate_gecko(NSContainer *This) nsIBaseWindow_SetVisibility(This->window, TRUE); nsIBaseWindow_SetEnabled(This->window, TRUE); + nsIWebBrowserFocus_Activate(This->focus); } void update_doc(HTMLDocument *This, DWORD flags)

1 0

James Hawkins : msi: Set media info strings to NULL after freeing them.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 5606428a718761a2dfb69bcaba9561e7bd9d038a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5606428a718761a2dfb69bcab… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 23 03:10:11 2007 -0500 msi: Set media info strings to NULL after freeing them. --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f2561d4..0c27a90 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -313,6 +313,9 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); + mi->disk_prompt = NULL; + mi->cabinet = NULL; + mi->volume_label = NULL; mi->disk_id++; mi->is_continuous = TRUE;

1 0

James Hawkins : msi: Include the null terminator when writing data to the stream.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 85bd53a6759685557d69a6464013d8fdabd290a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85bd53a6759685557d69a6464… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 23 03:08:42 2007 -0500 msi: Include the null terminator when writing data to the stream. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c00b869..24fa343 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2736,7 +2736,7 @@ static void set_admin_property_stream(LPCSTR file) hr = IStorage_CreateStream(stg, stmname, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - hr = IStream_Write(stm, data, sizeof(data) - 1, &count); + hr = IStream_Write(stm, data, sizeof(data), &count); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); IStream_Release(stm);

1 0

James Hawkins : msi: Don' t delete the table if the table deleted itself because of a release.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 39bcc662e46427d7a2f9380fa9ca4b1a9040a465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bcc662e46427d7a2f9380fa… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 23 03:07:54 2007 -0500 msi: Don't delete the table if the table deleted itself because of a release. --- dlls/msi/alter.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index e0a1b91..b8d315e 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -145,13 +145,18 @@ static UINT alter_add_column(MSIALTERVIEW *av) static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIALTERVIEW *av = (MSIALTERVIEW*)view; + UINT ref; TRACE("%p %p\n", av, record); if (av->hold == 1) av->table->ops->add_ref(av->table); else if (av->hold == -1) - av->table->ops->release(av->table); + { + ref = av->table->ops->release(av->table); + if (ref == 0) + av->table = NULL; + } if (av->colinfo) return alter_add_column(av); @@ -202,7 +207,8 @@ static UINT ALTER_delete( struct tagMSIVIEW *view ) MSIALTERVIEW *av = (MSIALTERVIEW*)view; TRACE("%p\n", av ); - av->table->ops->delete( av->table ); + if (av->table) + av->table->ops->delete( av->table ); msi_free( av ); return ERROR_SUCCESS;

1 0

James Hawkins : msi: Release the record only after using the record's data.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: b6cfc405bda9729936d348427e8768bbddd4c54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cfc405bda9729936d348427… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 23 03:06:59 2007 -0500 msi: Release the record only after using the record's data. --- 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 80caaac..cff5368 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4358,9 +4358,9 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) } key = MSI_RecordGetString(row, 6); - msiobj_release(&row->hdr); file = get_loaded_file(package, key); + msiobj_release(&row->hdr); if (!file) { ERR("Failed to load the service file\n");

1 0

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 October 2007