October 2006 - Wine-commits

James Hawkins : msi: Add tests for installing from continuous cabinets.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 1f3f88bf67d32983ff00d96bf58bf91c6e72ae02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3f88bf67d32983ff00d96bf… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:15:28 2006 -0700 msi: Add tests for installing from continuous cabinets. --- dlls/msi/tests/install.c | 126 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 117 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 2d845c4..aed5a78 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -147,6 +147,36 @@ static const CHAR service_control_dat[] "ServiceControl\tServiceControl\n" "ServiceControl\tTestService\t8\t\t0\tservice_comp"; +/* tables for test_continuouscabs */ +static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t1\taugustus"; + +static const CHAR cc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t2\t1\tTARGETDIR\t0"; + +static const CHAR cc_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus\n" + "feature\taugustus"; + +static const CHAR cc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t50000\t\t\t16384\t1"; + +static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -171,10 +201,22 @@ static const msi_table tables[] = ADD_TABLE(service_control) }; +static const msi_table cc_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ -#define MEDIA_SIZE 999999999 +#define MEDIA_SIZE 0x7FFFFFFF #define FOLDER_THRESHOLD 900000 /* the FCI callbacks */ @@ -191,6 +233,7 @@ static void mem_free(void *memory) static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { + sprintf(pccab->szCab, pv, pccab->iCab); return TRUE; } @@ -336,11 +379,10 @@ static INT_PTR get_open_info(char *pszNa return (INT_PTR)handle; } -static void add_file(HFCI hfci, const char *file, TCOMP compress) +static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) { char path[MAX_PATH]; char filename[MAX_PATH]; - BOOL res; lstrcpyA(path, CURR_DIR); lstrcatA(path, "\\"); @@ -348,9 +390,8 @@ static void add_file(HFCI hfci, const ch lstrcpyA(filename, file); - res = FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, progress, - get_open_info, compress); - ok(res, "Expected FCIAddFile to succeed\n"); + return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, + progress, get_open_info, compress); } static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) @@ -360,6 +401,7 @@ static void set_cab_parameters(PCCAB pCa pCabParams->cb = max_size; pCabParams->cbFolderThresh = FOLDER_THRESHOLD; pCabParams->setID = 0xbeef; + pCabParams->iCab = 1; lstrcpyA(pCabParams->szCabPath, CURR_DIR); lstrcatA(pCabParams->szCabPath, "\\"); lstrcpyA(pCabParams->szCab, name); @@ -384,7 +426,8 @@ static void create_cab_file(const CHAR * ptr = files; while (*ptr) { - add_file(hfci, ptr, tcompTYPE_MSZIP); + res = add_file(hfci, ptr, tcompTYPE_MSZIP); + ok(res, "Failed to add file: %s\n", ptr); ptr += lstrlen(ptr) + 1; } @@ -432,8 +475,6 @@ static void create_file(const CHAR *name static void create_test_files(void) { - get_program_files_dir(PROG_FILES_DIR); - CreateDirectoryA("msitest", NULL); create_file("msitest\\one.txt", 100); CreateDirectoryA("msitest\\first", NULL); @@ -716,10 +757,76 @@ static void test_packagecoltypes(void) DeleteFile(msifile); } +static void create_cc_test_files(void) +{ + CCAB cabParams; + HFCI hfci; + ERF erf; + BOOL res; + + create_file("maximus", 500); + create_file("augustus", 50000); + + set_cab_parameters(&cabParams, "test1.cab", 200); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, fci_delete, + get_temp_file, &cabParams, (void*)"test%d.cab"); + ok(hfci != NULL, "Failed to create an FCI context\n"); + + /* spews out hundreds of cab files. re-enable when cabinet.dll is fixed */ +#if 0 + res = add_file(hfci, "maximus", tcompTYPE_MSZIP); + ok(res, "Failed to add file maximus\n"); + + res = add_file(hfci, "augustus", tcompTYPE_MSZIP); + todo_wine + { + ok(res, "Failed to add file augustus\n"); + } +#endif + + res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(res, "Failed to flush the cabinet\n"); + + res = FCIDestroy(hfci); + ok(res, "Failed to destroy the cabinet\n"); + + DeleteFile("maximus"); + DeleteFile("augustus"); +} + +static void test_continuouscabs(void) +{ + UINT r; + + create_cc_test_files(); + create_database(msifile, cc_tables, sizeof(cc_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + } + + todo_wine + { + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile("test1.cab"); + DeleteFile("test2.cab"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; + get_program_files_dir(PROG_FILES_DIR); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); len = lstrlenA(CURR_DIR); @@ -729,4 +836,5 @@ START_TEST(install) test_MsiInstallProduct(); test_MsiSetComponentState(); test_packagecoltypes(); + test_continuouscabs(); }

1 0

James Hawkins : advpack: Fix the full path check.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 615d09f285015e392c66c5873e97c871323f9144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615d09f285015e392c66c5873… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:44:59 2006 -0700 advpack: Fix the full path check. --- dlls/advpack/install.c | 2 +- dlls/advpack/tests/install.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d63a959..b86c70a 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -221,7 +221,7 @@ static BOOL is_full_path(LPWSTR path) if (!path || lstrlenW(path) < MIN_PATH_LEN) return FALSE; - if (path[1] == ':' || (path[0] == '\\' && path[1] == '\\')) + if ((path[1] == ':' && path[2] == '\\') || (path[0] == '\\' && path[1] == '\\')) return TRUE; return FALSE; diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 00ed378..b594a1e 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -226,6 +226,23 @@ static void test_LaunchINFSection() DeleteFileA("test.inf"); } +static void test_LaunchINFSectionEx() +{ + HRESULT hr; + char cmdline[MAX_PATH]; + + create_inf_file("test.inf"); + + /* try an invalid CAB filename */ + lstrcpy(cmdline, CURR_DIR); + lstrcpy(cmdline, "\\"); + lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + ok(hr == 0, "Expected 0, got %d\n", hr); + + DeleteFileA("test.inf"); +} + START_TEST(install) { if (!init_function_pointers()) @@ -235,4 +252,5 @@ START_TEST(install) test_RunSetupCommand(); test_LaunchINFSection(); + test_LaunchINFSectionEx(); }

1 0

Mike McCormack : riched20: Make sure to use GlobalAlloc with GlobalFree.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: e971e0fb89e4c0db6149eaedb706a5ab6d4de7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e971e0fb89e4c0db6149eaedb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 14:24:48 2006 +0900 riched20: Make sure to use GlobalAlloc with GlobalFree. --- dlls/riched20/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 72529a0..3bb8b7b 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -76,7 +76,7 @@ static ULONG WINAPI EnumFormatImpl_Relea TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - HeapFree(GetProcessHeap(), 0, This->fmtetc); + GlobalFree(This->fmtetc); HeapFree(GetProcessHeap(), 0, This); } @@ -157,7 +157,7 @@ static HRESULT EnumFormatImpl_Create(FOR ret->ref = 1; ret->cur = 0; ret->fmtetc_cnt = fmtetc_cnt; - ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); + ret->fmtetc = GlobalAlloc(GMEM_ZEROINIT, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); *lplpformatetc = (LPENUMFORMATETC)ret; return S_OK; @@ -400,7 +400,7 @@ HRESULT ME_GetDataObject(ME_TextEditor * obj->fmtetc_cnt = 1; if(editor->mode & TM_RICHTEXT) obj->fmtetc_cnt++; - obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); + obj->fmtetc = GlobalAlloc(GMEM_ZEROINIT, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); if(editor->mode & TM_RICHTEXT) { obj->rtf = get_rtf_text(editor, lpchrg);

1 0

Mike McCormack : riched20: Create macro functions for allocating and freeing memory.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 8939587b19027f6582340ef42099b594459dfdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8939587b19027f6582340ef42… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 14:26:28 2006 +0900 riched20: Create macro functions for allocating and freeing memory. --- dlls/riched20/clipboard.c | 8 ++++---- dlls/riched20/editor.c | 4 ++-- dlls/riched20/editor.h | 24 ++++++++++++++++++++---- dlls/riched20/reader.c | 20 +++----------------- dlls/riched20/richole.c | 4 ++-- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 3bb8b7b..99d9503 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -77,7 +77,7 @@ static ULONG WINAPI EnumFormatImpl_Relea if(!ref) { GlobalFree(This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); + richedit_free(This); } return ref; @@ -152,7 +152,7 @@ static HRESULT EnumFormatImpl_Create(FOR EnumFormatImpl *ret; TRACE("\n"); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); + ret = richedit_alloc(sizeof(EnumFormatImpl)); ret->lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; @@ -195,7 +195,7 @@ static ULONG WINAPI DataObjectImpl_Relea if(This->unicode) GlobalFree(This->unicode); if(This->rtf) GlobalFree(This->rtf); if(This->fmtetc) GlobalFree(This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); + richedit_free(This); } return ref; @@ -388,7 +388,7 @@ HRESULT ME_GetDataObject(ME_TextEditor * DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); + obj = richedit_alloc(sizeof(DataObjectImpl)); if(cfRTF == 0) cfRTF = RegisterClipboardFormatA("Rich Text Format"); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0969787..93aed91 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1998,7 +1998,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND /* potentially each char may be a CR, why calculate the exact value with O(N) when we can just take a bigger buffer? :) */ int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (crlfmul*nCount + 1) * sizeof(WCHAR)); + LPWSTR buffer = richedit_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); DWORD buflen = ex->cb; LRESULT rc; DWORD flags = 0; @@ -2006,7 +2006,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); - HeapFree(GetProcessHeap(),0,buffer); + richedit_free(buffer); return rc; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index bb3be88..87742c5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -21,9 +21,26 @@ #include "editstr.h" #include "wine/unicode.h" -#define ALLOC_OBJ(type) HeapAlloc(me_heap, 0, sizeof(type)) -#define ALLOC_N_OBJ(type, count) HeapAlloc(me_heap, 0, (count)*sizeof(type)) -#define FREE_OBJ(ptr) HeapFree(me_heap, 0, ptr) +extern HANDLE me_heap; + +static inline void *richedit_alloc( size_t len ) +{ + return HeapAlloc( me_heap, 0, len ); +} + +static inline BOOL richedit_free( void *ptr ) +{ + return HeapFree( me_heap, 0, ptr ); +} + +static inline void *richedit_realloc( void *ptr, size_t len ) +{ + return HeapReAlloc( me_heap, 0, ptr, len ); +} + +#define ALLOC_OBJ(type) richedit_alloc(sizeof(type)) +#define ALLOC_N_OBJ(type, count) richedit_alloc((count)*sizeof(type)) +#define FREE_OBJ(ptr) richedit_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) @@ -264,7 +281,6 @@ ME_DisplayItem *ME_FindItemAtOffset(ME_T void ME_StreamInFill(ME_InStream *stream); int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; -extern HANDLE me_heap; extern void DoWrap(ME_TextEditor *editor); /* writer.c */ diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index f3a917c..b2fb444 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -86,17 +86,9 @@ static void RTFPutCodePageChar(RTF_Info * Return pointer to block of size bytes, or NULL if there's * not enough memory available. */ -static inline void *RTFAlloc(int size) -{ - return HeapAlloc(me_heap, 0, size); -} - - -static inline void * RTFReAlloc(void *ptr, int size) -{ - return HeapReAlloc(me_heap, 0, ptr, size); -} - +#define RTFAlloc(size) richedit_alloc(size) +#define RTFReAlloc(ptr, size) richedit_realloc(ptr, size) +#define RTFFree(ptr) richedit_free(ptr) /* * Saves a string on the heap and returns a pointer to it. @@ -112,12 +104,6 @@ static inline char *RTFStrSave(char *s) } -static inline void RTFFree(void *p) -{ - HeapFree(me_heap, 0, p); -} - - /* ---------------------------------------------------------------------- */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4601a1a..0585e43 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -112,7 +112,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) if (!ref) { TRACE ("Destroying %p\n", This); - HeapFree(GetProcessHeap(),0,This); + richedit_free(This); } return ref; } @@ -529,7 +529,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor { IRichEditOleImpl *reo; - reo = HeapAlloc(GetProcessHeap(), 0, sizeof(IRichEditOleImpl)); + reo = richedit_alloc(sizeof(IRichEditOleImpl)); if (!reo) return 0;

1 0

Andrew Talbot : user: Remove superfluous shadow variable.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 83b836b3f9d684d9f9b4bb33395d66a2c900b02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b836b3f9d684d9f9b4bb333… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 23 22:53:41 2006 +0100 user: Remove superfluous shadow variable. --- dlls/user/dde_client.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user/dde_client.c b/dlls/user/dde_client.c index 977e428..ecd3b3b 100644 --- a/dlls/user/dde_client.c +++ b/dlls/user/dde_client.c @@ -1035,7 +1035,6 @@ static HDDEDATA WDML_SyncWaitTransaction while (PeekMessageW(&msg, 0, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE)) { - WDML_CONV *pConv; HDDEDATA hdd; EnterCriticalSection(&WDML_CritSect);

1 0

Jacek Caban : urlmon: Added video/avi mime filter implementation.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 84253b011d77a243123000e99bcfe36d9be4308a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84253b011d77a243123000e99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 23 23:38:31 2006 +0200 urlmon: Added video/avi mime filter implementation. --- dlls/urlmon/tests/misc.c | 15 ++++++++++++++- dlls/urlmon/urlmon_main.c | 13 ++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 17657e7..5cfe701 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -336,6 +336,7 @@ static const WCHAR mimeImageGif[] = {'i' static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; 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 struct { LPCWSTR url; @@ -393,6 +394,12 @@ static BYTE data40[] = {0x4d,0x4d,0x00,0 static BYTE data41[] = {0x4d,0x4d,0xff}; static BYTE data42[] = {0x4d,0x4d}; static BYTE data43[] = {0x00,0x4d,0x4d,0x00}; +static BYTE data44[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20,0xff}; +static BYTE data45[] = {'R','I','F','f',0xff,0xff,0xff,0xff,'A','V','I',0x20,0xff}; +static BYTE data46[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20}; +static BYTE data47[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x21,0xff}; +static BYTE data48[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20,'<','h','t','m','l','>'}; +static BYTE data49[] = {'R','I','F','F',0x0f,0x0f,0xf0,0xf0,'A','V','I',0x20,0xf0,0x00}; static const struct { BYTE *data; @@ -441,7 +448,13 @@ static const struct { {data40, sizeof(data40), mimeTextHtml}, {data41, sizeof(data41), mimeImageTiff}, {data42, sizeof(data42), mimeTextPlain}, - {data43, sizeof(data43), mimeAppOctetStream} + {data43, sizeof(data43), mimeAppOctetStream}, + {data44, sizeof(data44), mimeVideoAvi}, + {data45, sizeof(data45), mimeTextPlain}, + {data46, sizeof(data46), mimeTextPlain}, + {data47, sizeof(data47), mimeTextPlain}, + {data48, sizeof(data48), mimeTextHtml}, + {data49, sizeof(data49), mimeVideoAvi} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 044c2f8..916747b 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -459,6 +459,15 @@ static BOOL image_bmp_filter(LPVOID buf, && *(DWORD*)((BYTE*)buf+6) == 0; } +static BOOL video_avi_filter(LPVOID buf, DWORD size) +{ + const BYTE const *b = buf; + + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; +} + static BOOL text_plain_filter(LPVOID buf, DWORD size) { UCHAR *ptr; @@ -516,6 +525,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; 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 wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -530,6 +540,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszImageTiff, image_tiff_filter}, {wszImageXPng, image_xpng_filter}, {wszImageBmp, image_bmp_filter}, + {wszVideoAvi, video_avi_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} }; @@ -564,7 +575,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC ret = pwzMimeProposed; /* text/html is a special case */ - if(!strcmpW(pwzMimeProposed, wszTextHtml) && !strcmpW(ret, wszTextPlain)) + if(!strcmpW(pwzMimeProposed, wszTextHtml) && !strcmpW(ret, wszTextPlain)) ret = wszTextHtml; }

1 0

Jacek Caban : urlmon: Code clean up.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 3515dbc37ce2cf806c810b60c68955ecc600fa46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3515dbc37ce2cf806c810b60c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 23 23:39:42 2006 +0200 urlmon: Code clean up. --- dlls/urlmon/urlmon_main.c | 50 ++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 916747b..ce5fd5b 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -402,9 +402,8 @@ void WINAPI ReleaseBindInfo(BINDINFO* pb * * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. */ -static BOOL text_html_filter(LPVOID buf, DWORD size) +static BOOL text_html_filter(const BYTE const *b, DWORD size) { - const char *b = buf; int i; if(size < 5) @@ -422,10 +421,8 @@ static BOOL text_html_filter(LPVOID buf, return FALSE; } -static BOOL image_gif_filter(LPVOID buf, DWORD size) +static BOOL image_gif_filter(const BYTE const *b, DWORD size) { - const BYTE const *b = buf; - return size >= 6 && (b[0] == 'G' || b[0] == 'g') && (b[1] == 'I' || b[1] == 'i') @@ -435,44 +432,41 @@ static BOOL image_gif_filter(LPVOID buf, && (b[5] == 'A' || b[5] == 'a'); } -static BOOL image_pjpeg_filter(LPVOID buf, DWORD size) +static BOOL image_pjpeg_filter(const BYTE const *b, DWORD size) { - return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; + return size > 2 && b[0] == 0xff && b[1] == 0xd8; } -static BOOL image_tiff_filter(LPVOID buf, DWORD size) +static BOOL image_tiff_filter(const BYTE const *b, DWORD size) { - return size > 2 && *(WORD*)buf == 0x4d4d; + return size > 2 && b[0] == 0x4d && b[1] == 0x4d; } -static BOOL image_xpng_filter(LPVOID buf, DWORD size) +static BOOL image_xpng_filter(const BYTE const *b, DWORD size) { static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; - return size > sizeof(xpng_header) && !memcmp(buf, xpng_header, sizeof(xpng_header)); + return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); } -static BOOL image_bmp_filter(LPVOID buf, DWORD size) +static BOOL image_bmp_filter(const BYTE const *b, DWORD size) { return size >= 14 - && *(BYTE*)buf == 0x42 - && *((BYTE*)buf+1) == 0x4d - && *(DWORD*)((BYTE*)buf+6) == 0; + && b[0] == 0x42 && b[1] == 0x4d + && *(DWORD*)(b+6) == 0; } -static BOOL video_avi_filter(LPVOID buf, DWORD size) +static BOOL video_avi_filter(const BYTE const *b, DWORD size) { - const BYTE const *b = buf; - return size > 12 && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; } -static BOOL text_plain_filter(LPVOID buf, DWORD size) +static BOOL text_plain_filter(const BYTE const *b, DWORD size) { - UCHAR *ptr; + const BYTE *ptr; - for(ptr = buf; ptr < (UCHAR*)buf+size-1; ptr++) { + for(ptr = b; ptr < b+size-1; ptr++) { if(*ptr < 0x20 && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') return FALSE; } @@ -480,7 +474,7 @@ static BOOL text_plain_filter(LPVOID buf return TRUE; } -static BOOL application_octet_stream_filter(LPVOID buf, DWORD size) +static BOOL application_octet_stream_filter(const BYTE const *b, DWORD size) { return TRUE; } @@ -515,6 +509,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC } if(pBuffer) { + const BYTE const *buf = pBuffer; DWORD len; LPCWSTR ret = NULL; int i; @@ -532,7 +527,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const struct { LPCWSTR mime; - BOOL (*filter)(LPVOID,DWORD); + BOOL (*filter)(const BYTE const*,DWORD); } mime_filters[] = { {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter}, @@ -555,7 +550,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC } if(i == sizeof(mime_filters)/sizeof(*mime_filters) - || mime_filters[i].filter(pBuffer, cbSize)) { + || mime_filters[i].filter(buf, cbSize)) { len = strlenW(pwzMimeProposed)+1; *ppwzMimeOut = CoTaskMemAlloc(len*sizeof(WCHAR)); memcpy(*ppwzMimeOut, pwzMimeProposed, len*sizeof(WCHAR)); @@ -565,11 +560,16 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC i=0; while(!ret) { - if(mime_filters[i].filter(pBuffer, cbSize)) + if(mime_filters[i].filter(buf, cbSize)) ret = mime_filters[i].mime; i++; } + TRACE("found %s for data\n" + "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + debugstr_w(ret), buf[0],buf[1],buf[2],buf[3], buf[4],buf[5],buf[6],buf[7], + buf[8],buf[9],buf[10],buf[11], buf[12],buf[13],buf[14],buf[15]); + if(pwzMimeProposed) { if(i == sizeof(mime_filters)/sizeof(*mime_filters)) ret = pwzMimeProposed;

1 0

Jacek Caban : urlmon: Added video/mpeg mime filter.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 53f68ae3e663abec500a3df6e69d28495822da93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f68ae3e663abec500a3df6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 23 23:40:58 2006 +0200 urlmon: Added video/mpeg mime filter. --- dlls/urlmon/tests/misc.c | 13 ++++++++++++- dlls/urlmon/urlmon_main.c | 9 +++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5cfe701..0fa5f32 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -337,6 +337,7 @@ static const WCHAR mimeImageBmp[] = {'i' static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; 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 struct { LPCWSTR url; @@ -400,6 +401,11 @@ static BYTE data46[] = {'R','I','F','F', static BYTE data47[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x21,0xff}; static BYTE data48[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'A','V','I',0x20,'<','h','t','m','l','>'}; static BYTE data49[] = {'R','I','F','F',0x0f,0x0f,0xf0,0xf0,'A','V','I',0x20,0xf0,0x00}; +static BYTE data50[] = {0x00,0x00,0x01,0xb3,0xff}; +static BYTE data51[] = {0x00,0x00,0x01,0xba,0xff}; +static BYTE data52[] = {0x00,0x00,0x01,0xb8,0xff}; +static BYTE data53[] = {0x00,0x00,0x01,0xba}; +static BYTE data54[] = {0x00,0x00,0x01,0xba,'<','h','t','m','l','>'}; static const struct { BYTE *data; @@ -454,7 +460,12 @@ static const struct { {data46, sizeof(data46), mimeTextPlain}, {data47, sizeof(data47), mimeTextPlain}, {data48, sizeof(data48), mimeTextHtml}, - {data49, sizeof(data49), mimeVideoAvi} + {data49, sizeof(data49), mimeVideoAvi}, + {data50, sizeof(data50), mimeVideoMpeg}, + {data51, sizeof(data51), mimeVideoMpeg}, + {data52, sizeof(data52), mimeAppOctetStream}, + {data53, sizeof(data53), mimeAppOctetStream}, + {data54, sizeof(data54), mimeTextHtml} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index ce5fd5b..d0d8f2c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -462,6 +462,13 @@ static BOOL video_avi_filter(const BYTE && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; } +static BOOL video_mpeg_filter(const BYTE const *b, DWORD size) +{ + return size > 4 + && !b[0] && !b[1] && b[2] == 0x01 + && (b[3] == 0xb3 || b[3] == 0xba); +} + static BOOL text_plain_filter(const BYTE const *b, DWORD size) { const BYTE *ptr; @@ -521,6 +528,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; 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 wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR wszAppOctetStream[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -536,6 +544,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszImageXPng, image_xpng_filter}, {wszImageBmp, image_bmp_filter}, {wszVideoAvi, video_avi_filter}, + {wszVideoMpeg, video_mpeg_filter}, {wszTextPlain, text_plain_filter}, {wszAppOctetStream, application_octet_stream_filter} };

1 0

James Hawkins : msi: Add support for localizable strings in MsiDatabaseImport.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 5b19cc79bd4c35f1710280e569ec2847597b679c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b19cc79bd4c35f1710280e56… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:07:04 2006 -0700 msi: Add support for localizable strings in MsiDatabaseImport. --- dlls/msi/database.c | 15 ++++++++++++--- dlls/msi/tests/install.c | 5 +---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index e496acf..8abed5c 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -351,7 +351,7 @@ static LPWSTR msi_build_createsql_column LPCWSTR type; DWORD sql_size = 1, i, len; WCHAR expanded[128], *ptr; - WCHAR size[10], comma[2], extra[10]; + WCHAR size[10], comma[2], extra[30]; static const WCHAR column_fmt[] = {'`','%','s','`',' ','%','s','%','s','%','s','%','s',' ',0}; static const WCHAR size_fmt[] = {'(','%','s',')',0}; @@ -359,6 +359,7 @@ static LPWSTR msi_build_createsql_column static const WCHAR type_int[] = {'I','N','T',0}; static const WCHAR type_long[] = {'L','O','N','G',0}; static const WCHAR type_notnull[] = {' ','N','O','T',' ','N','U','L','L',0}; + static const WCHAR localizable[] = {' ','L','O','C','A','L','I','Z','A','B','L','E',0}; columns = msi_alloc_zero(sql_size * sizeof(WCHAR)); if (!columns) @@ -376,12 +377,20 @@ static LPWSTR msi_build_createsql_column ptr = &types[i][1]; len = atolW(ptr); + extra[0] = '\0'; switch (types[i][0]) { - case 'l': case 's': + case 'l': lstrcpyW(extra, type_notnull); - case 'L': case 'S': + case 'L': + lstrcatW(extra, localizable); + type = type_char; + sprintfW(size, size_fmt, ptr); + break; + case 's': + lstrcpyW(extra, type_notnull); + case 'S': type = type_char; sprintfW(size, size_fmt, ptr); break; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f5a2eeb..83e68df 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -766,13 +766,10 @@ static void test_packagecoltypes(void) ok(count == 6, "Expected 6, got %d\n", count); ok(check_record(rec, 1, "i2"), "wrong column label\n"); ok(check_record(rec, 2, "i4"), "wrong column label\n"); + ok(check_record(rec, 3, "L64"), "wrong column label\n"); ok(check_record(rec, 4, "S255"), "wrong column label\n"); ok(check_record(rec, 5, "S32"), "wrong column label\n"); ok(check_record(rec, 6, "S72"), "wrong column label\n"); - todo_wine - { - ok(check_record(rec, 3, "L64"), "wrong column label\n"); - } MsiCloseHandle(rec); MsiCloseHandle(view);

1 0

Huw Davies : winex11.drv: Initialize data-> xim to NULL if xim has been disabled.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: becf09f3f8450321b42fd1adc162aba0ed386204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=becf09f3f8450321b42fd1adc… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 23 18:00:06 2006 +0100 winex11.drv: Initialize data->xim to NULL if xim has been disabled. --- dlls/winex11.drv/x11drv_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 979b7f1..a33a374 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -534,7 +534,9 @@ #endif if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); - if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style ))) + if (!use_xim) + data->xim = NULL; + else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style ))) WARN("Input Method is not available\n"); if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE,

1 0