February 2007 - Wine-Commits

Stefan Dösinger : wined3d: Load single attribute setter functions.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: d73c71ad8da8d9c48b7828d9e5ad998828e05164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73c71ad8da8d9c48b7828d9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:49:24 2007 +0100 wined3d: Load single attribute setter functions. --- include/wine/wined3d_gl.h | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 0e48f5a..fcec035 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1592,6 +1592,42 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1DARBPROC, glVertexAttrib1dARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1DVARBPROC, glVertexAttrib1dvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1FARBPROC, glVertexAttrib1fARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1FVARBPROC, glVertexAttrib1fvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1SARBPROC, glVertexAttrib1sARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB1SVARBPROC, glVertexAttrib1svARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2DARBPROC, glVertexAttrib2dARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2DVARBPROC, glVertexAttrib2dvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2FARBPROC, glVertexAttrib2fARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2FVARBPROC, glVertexAttrib2fvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2SARBPROC, glVertexAttrib2sARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB2SVARBPROC, glVertexAttrib2svARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3DARBPROC, glVertexAttrib3dARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3DVARBPROC, glVertexAttrib3dvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3FARBPROC, glVertexAttrib3fARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3FVARBPROC, glVertexAttrib3fvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3SARBPROC, glVertexAttrib3sARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB3SVARBPROC, glVertexAttrib3svARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NBVARBPROC, glVertexAttrib4NbvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NIVARBPROC, glVertexAttrib4NivARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NSVARBPROC, glVertexAttrib4NsvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBARBPROC, glVertexAttrib4NubARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUBVARBPROC, glVertexAttrib4NubvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUIVARBPROC, glVertexAttrib4NuivARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4NUSVARBPROC, glVertexAttrib4NusvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4BVARBPROC, glVertexAttrib4bvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4DARBPROC, glVertexAttrib4dARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4DVARBPROC, glVertexAttrib4dvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4FARBPROC, glVertexAttrib4fARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4FVARBPROC, glVertexAttrib4fvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4IVARBPROC, glVertexAttrib4ivARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4SARBPROC, glVertexAttrib4sARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4SVARBPROC, glVertexAttrib4svARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4UBVARBPROC, glVertexAttrib4ubvARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4UIVARBPROC, glVertexAttrib4uivARB); \ + USE_GL_FUNC(PGLFNVERTEXATTRIB4USVARBPROC, glVertexAttrib4usvARB); \ USE_GL_FUNC(PGLFNGETPROGRAMIVARBPROC, glGetProgramivARB); \ /* GL_ARB_shader_objects */ \ USE_GL_FUNC(WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC, glGetObjectParameterivARB); \

1 0

Stefan Dösinger : wined3d: Move lights to the state table.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 174b6321eba9633419737a189019f66d5d34a2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b6321eba9633419737a189… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:48:52 2007 +0100 wined3d: Move lights to the state table. --- dlls/wined3d/device.c | 110 +------------------------------------- dlls/wined3d/state.c | 113 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 120 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=174b6321eba9633419737…

1 0

Alexandre Julliard : winex11.drv: Added a check for the ATI driver corrupting %fs.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 5fce682f41e43539a1c1cdae18990ccb959a8fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce682f41e43539a1c1cdae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 18:18:07 2007 +0100 winex11.drv: Added a check for the ATI driver corrupting %fs. Based on a patch by Lei Zhang. --- dlls/winex11.drv/opengl.c | 10 +++++++++- include/wine/library.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ac0c8ba..dbbd972 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -292,8 +292,17 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) template.visualid = XVisualIDFromVisual(visual); vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); if (vis) { + WORD old_fs = wine_get_fs(); /* Create a GLX Context. Without one we can't query GL information */ ctx = pglXCreateContext(gdi_display, vis, None, GL_TRUE); + if (wine_get_fs() != old_fs) + { + wine_set_fs( old_fs ); + wine_tsx11_unlock(); + ERR( "%%fs register corrupted, probably broken ATI driver, disabling OpenGL.\n" ); + ERR( "You need to set the \"UseFastTls\" option to \"2\" in your X config file.\n" ); + return FALSE; + } } if (ctx) { @@ -411,7 +420,6 @@ LOAD_FUNCPTR(glXFreeMemoryNV) #undef LOAD_FUNCPTR if(!X11DRV_WineGL_InitOpenglInfo()) { - ERR("Intialization of OpenGL info failed, disabling OpenGL!\n"); wine_dlclose(opengl_handle, NULL, 0); opengl_handle = NULL; return FALSE; diff --git a/include/wine/library.h b/include/wine/library.h index cbaa026..a1845cd 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -177,7 +177,7 @@ inline static int wine_ldt_is_empty( const LDT_ENTRY *ent ) # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short wine_get_##seg(void); \ extern inline unsigned short wine_get_##seg(void) \ - { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } + { unsigned short res; __asm__ __volatile__("movw %%" #seg ",%w0" : "=r"(res)); return res; } # define __DEFINE_SET_SEG(seg) \ extern inline void wine_set_##seg(int val); \ extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); }

1 0

Alexandre Julliard : shell32: Don't wrap SHELL_ConfirmIDs in an assert. Fixed return value.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 9d2d5eae2d823470dacb013122776a94ff34a70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2d5eae2d823470dacb01312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 14:43:50 2007 +0100 shell32: Don't wrap SHELL_ConfirmIDs in an assert. Fixed return value. --- dlls/shell32/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 07f19e0..5410c97 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -282,9 +282,9 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI assert(nKindOfDialog >= 0 && nKindOfDialog < 32); if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) - return IDYES; + return TRUE; - assert(SHELL_ConfirmIDs(nKindOfDialog, &ids)); + if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR));

1 0

Shanren Zhou : comctl32: Add header tests.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 613998d4f6ff953a22a4455a28f77d2126642c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=613998d4f6ff953a22a4455a2… Author: Shanren Zhou <shanren(a)ucla.edu> Date: Mon Feb 12 19:53:51 2007 -0800 comctl32: Add header tests. --- dlls/comctl32/tests/header.c | 235 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 234 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 0755f46..87e0bf5 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1,6 +1,7 @@ /* Unit test suite for header control. * - * Copyright 2005 Vijay Kiran Kamuju + * Copyright 2005 Vijay Kiran Kamuju + * Copyright 2007 Shanren Zhou * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -50,6 +51,8 @@ static HWND hWndHeader; #define compare(val, exp, fmt) ok((val) == (exp), #val " value: " fmt ", expected: " fmt "\n", (val), (exp)) +#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) + static void expect_notify(INT iCode, BOOL fUnicode, HDITEMA *lpItem) { assert(nExpectedNotify < 10); @@ -494,6 +497,235 @@ static void test_header_control (void) DestroyWindow(hWndHeader); } +static void test_hdm_getitemrect(void) +{ + /* Afer the setorderarray is called, item with index 0 becomes + * the 2nd item and item with index 1 becomes 1st item + */ + RECT rect; + int retVal; + retVal = SendMessage(hWndHeader, HDM_GETITEMRECT, 0, (LPARAM) &rect); + ok(retVal == TRUE, "Getting item rect should TRUE, got %d\n", retVal); + /* check bounding rectangle information */ + expect(80, rect.left); + expect(0, rect.top); + expect(160, rect.right); + expect(18, rect.bottom); + + retVal = SendMessage(hWndHeader, HDM_GETITEMRECT, 1, (LPARAM) &rect); + ok(retVal == TRUE, "Getting item rect should TRUE, got %d\n", retVal); + /* check bounding rectangle information */ + expect(0, rect.left); + expect(0, rect.top); + expect(80, rect.right); + expect(18, rect.bottom); + retVal = SendMessage(hWndHeader, HDM_GETITEMRECT, 10, (LPARAM) &rect); + ok(retVal == 0, "Getting rect of non-existing item should return 0, got %d\n", retVal); +} + +static void test_hdm_layout (void) +{ + int retVal; + RECT rect; + HDLAYOUT hdLayout; + WINDOWPOS windowPos; + hdLayout.prc = &rect; + hdLayout.pwpos = &windowPos; + retVal = SendMessage(hWndHeader, HDM_LAYOUT, 0, (LPARAM) &hdLayout); + expect(TRUE, retVal); +} + +static void test_hdm_ordertoindex (void) +{ + int retVal; + retVal = SendMessage(hWndHeader, HDM_ORDERTOINDEX, 1, 0); + expect(0, retVal); +} + +static void test_hdm_hittest (void) +{ + int retVal; + POINT pt; + HDHITTESTINFO hdHitTestInfo; + const int firstItemMaxRight = 80; + const int secondItemMaxRight = 160; + const int maxBottom = 18; + /* Afer the setorderarray is called, item with index 0 becomes + * the 2nd item and item with index 1 becomes 1st item + */ + pt.x = firstItemMaxRight - 1; + pt.y = maxBottom - 1; + hdHitTestInfo.pt = pt; + retVal = SendMessage(hWndHeader, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); + expect(1, retVal); + expect(1, hdHitTestInfo.iItem); + + pt.x = secondItemMaxRight - 1; + pt.y = maxBottom - 1; + hdHitTestInfo.pt = pt; + retVal = SendMessage(hWndHeader, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); + expect(0, retVal); + expect(0, hdHitTestInfo.iItem); + + pt.x = secondItemMaxRight; + pt.y = maxBottom + 1; + hdHitTestInfo.pt = pt; + todo_wine + { + retVal = SendMessage(hWndHeader, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); + expect(-1, retVal); + } +} + +static void test_hdm_sethotdivider (void) +{ + int retVal; + /* low word: x coordinate = 5 + * high word: y coordinate = 5 + */ + todo_wine + { + retVal = SendMessage(hWndHeader, HDM_SETHOTDIVIDER, TRUE, (LPARAM) 0X00050005); + expect(0, retVal); + } + retVal = SendMessage(hWndHeader, HDM_SETHOTDIVIDER, FALSE, 100); + expect(100, retVal); + retVal = SendMessage(hWndHeader, HDM_SETHOTDIVIDER, FALSE, 1); + expect(1, retVal); +} + +static void test_hdm_imageMessages (void) +{ + HIMAGELIST hImageList; + HIMAGELIST hImageListRetVal; + hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_SETIMAGELIST, 0, (LPARAM) &hImageList); + ok(hImageListRetVal == NULL, "Expected NULL, got %d\n", (int) hImageListRetVal); + hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_GETIMAGELIST, 0, 0); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); + hImageListRetVal = (HIMAGELIST) SendMessage(hWndHeader, HDM_CREATEDRAGIMAGE, 0, 0); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); +} + +static void test_hdm_filterMessages (void) +{ + int retVal; + todo_wine + { + /* msdn incorrecly states that return value + * is the index of the filter control being + * modified. The sendMessage here should + * return previous filter timeout value + */ + retVal = SendMessage(hWndHeader, HDM_SETFILTERCHANGETIMEOUT, 1, 100); + expect(1000, retVal); + retVal = SendMessage(hWndHeader, HDM_CLEARFILTER, 0, 1); + expect(1, retVal); + retVal = SendMessage(hWndHeader, HDM_EDITFILTER, 1, 0); + expect(1, retVal); + } +} + +static void test_hdm_unicodeformatMessages (void) +{ + int retVal; + retVal = SendMessage(hWndHeader, HDM_SETUNICODEFORMAT, TRUE, 0); + expect(0, retVal); + retVal = SendMessage(hWndHeader, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, retVal); +} + +static void test_hdm_bitmapmarginMessages (void) +{ + int retVal; + retVal = SendMessage(hWndHeader, HDM_GETBITMAPMARGIN, 0, 0); + expect(6, retVal); +} + +static void test_hdm_index_messages (void) +{ + int retVal; + int loopcnt; + int strcmpResult; + int iSize; + static const int lpiarray[2] = {1, 0}; + static int lpiarrayReceived[2]; + static char firstHeaderItem[] = "Name"; + static char secondHeaderItem[] = "Size"; + static char thirdHeaderItem[] = "Type"; + static char fourthHeaderItem[] = "Data Modified"; + static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; + HDITEM hdItem; + hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; + hdItem.fmt = HDF_LEFT; + hdItem.cxy = 80; + hdItem.cchTextMax = 260; + hWndHeader = create_header_control(); + for ( loopcnt = 0 ; loopcnt < 4 ; loopcnt++ ) + { + hdItem.pszText = items[loopcnt]; + retVal = SendMessage(hWndHeader, HDM_INSERTITEM, loopcnt, (LPARAM) &hdItem); + ok(retVal == loopcnt, "Adding item %d failed with return value %d\n", ( loopcnt + 1 ), retVal); + } + + retVal = SendMessage(hWndHeader, HDM_DELETEITEM, 3, (LPARAM) &hdItem); + ok(retVal == TRUE, "Deleting item 3 should return TRUE, got %d\n", retVal); + retVal = SendMessage(hWndHeader, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); + + retVal = SendMessage(hWndHeader, HDM_DELETEITEM, 3, (LPARAM) &hdItem); + ok(retVal == FALSE, "Deleting already-deleted item should return FALSE, got %d\n", retVal); + retVal = SendMessage(hWndHeader, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); + + retVal = SendMessage(hWndHeader, HDM_DELETEITEM, 2, (LPARAM) &hdItem); + ok(retVal == TRUE, "Deleting item 2 should return TRUE, got %d\n", retVal); + retVal = SendMessage(hWndHeader, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + ok(retVal == 2, "Getting item count should return 2, got %d\n", retVal); + + retVal = SendMessage(hWndHeader, HDM_GETITEM, 3, (LPARAM) &hdItem); + ok(retVal == FALSE, "Getting already-deleted item should return FALSE, got %d\n", retVal); + + retVal = SendMessage(hWndHeader, HDM_GETITEM, 0, (LPARAM) &hdItem); + ok(retVal == TRUE, "Getting the 1st header item should return TRUE, got %d\n", retVal); + /* check if the item is the right one */ + strcmpResult = strcmp(hdItem.pszText, firstHeaderItem); + expect(0, strcmpResult); + expect(80, hdItem.cxy); + + iSize = SendMessage(hWndHeader, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hWndHeader, HDM_SETORDERARRAY, (WPARAM) iSize , (LPARAM) (LPINT) lpiarray ); + ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal); + retVal = SendMessage(hWndHeader, HDM_GETORDERARRAY, (WPARAM) iSize, (LPARAM) (LPINT) lpiarrayReceived ); + ok(retVal == TRUE, "Getting header items order should return TRUE, got %d\n", retVal); + /* check if the array order is set correctly and the size of the array is corret. */ + expect(2, iSize); + expect(lpiarray[0], lpiarrayReceived[0]); + expect(lpiarray[1], lpiarrayReceived[1]); + + hdItem.mask = HDI_FORMAT; + hdItem.fmt = HDF_CENTER | HDF_STRING; + retVal = SendMessage(hWndHeader, HDM_SETITEM, 0, (LPARAM) &hdItem); + ok(retVal == TRUE, "Aligning 1st header item to center should return TRUE, got %d\n", retVal); + hdItem.fmt = HDF_RIGHT | HDF_STRING; + retVal = SendMessage(hWndHeader, HDM_SETITEM, 1, (LPARAM) &hdItem); + ok(retVal == TRUE, "Aligning 2nd header item to right should return TRUE, got %d\n", retVal); +} + +static void test_header_messages (void) +{ + + test_hdm_index_messages(); + test_hdm_getitemrect(); + test_hdm_hittest(); + test_hdm_layout(); + test_hdm_ordertoindex(); + test_hdm_sethotdivider(); + + test_hdm_imageMessages(); + test_hdm_filterMessages(); + test_hdm_unicodeformatMessages(); + test_hdm_bitmapmarginMessages(); +} #define TEST_NMCUSTOMDRAW(draw_stage, item_spec, lparam, _left, _top, _right, _bottom) \ ok(nm->dwDrawStage == draw_stage, "Invalid dwDrawStage %d vs %d\n", draw_stage, nm->dwDrawStage); \ @@ -832,6 +1064,7 @@ START_TEST(header) test_header_control(); test_header_order(); test_customdraw(); + test_header_messages(); DestroyWindow(hHeaderParentWnd); }

1 0

Alexandre Julliard : d3d8: Avoid a size_t printf format warning.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: a43cb2807a2ff5198e5051e06c44498b3510db7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43cb2807a2ff5198e5051e06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 14:43:14 2007 +0100 d3d8: Avoid a size_t printf format warning. --- dlls/d3d8/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 52774ad..afe9ff1 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -276,7 +276,7 @@ size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXE const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element; D3DVSD_TOKENTYPE token_type; - size_t element_count = 0; + unsigned int element_count = 0; DWORD stream = 0; int offset = 0;

1 0

Jacek Caban : mshtml: Make load_gecko thread safe.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: bdf2bf93a8b723c5ef24cd661c5ede0231580b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf2bf93a8b723c5ef24cd661… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 13 18:06:25 2007 +0100 mshtml: Make load_gecko thread safe. --- dlls/mshtml/install.c | 4 ++- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 62 +++++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index ddc3edc..07f83e7 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -358,7 +358,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; } -void install_wine_gecko(void) +BOOL install_wine_gecko(void) { HANDLE hsem; @@ -374,4 +374,6 @@ void install_wine_gecko(void) ReleaseSemaphore(hsem, 1, NULL); CloseHandle(hsem); + + return TRUE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ca5527b..7038c70 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -370,7 +370,7 @@ HRESULT HTMLElement_QI(HTMLElement*,REFIID,void**); HTMLDOMNode *get_node(HTMLDocument*,nsIDOMNode*); void release_nodes(HTMLDocument*); -void install_wine_gecko(void); +BOOL install_wine_gecko(void); /* editor */ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 31e9551..2cf4d88 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -321,30 +321,13 @@ static void set_profile(void) nsIProfile_Release(profile); } -static BOOL load_gecko(void) +static BOOL init_xpcom(PRUnichar *gre_path) { nsresult nsres; nsIObserver *pStartNotif; nsIComponentRegistrar *registrar = NULL; nsAString path; nsIFile *gre_dir; - PRUnichar gre_path[MAX_PATH]; - - static BOOL tried_load = FALSE; - - TRACE("()\n"); - - if(tried_load) - return pCompMgr != NULL; - tried_load = TRUE; - - if(!load_wine_gecko(gre_path) && !load_mozctl(gre_path) && !load_mozilla(gre_path)) { - install_wine_gecko(); - if(!load_wine_gecko(gre_path)) { - MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); - return FALSE; - } - } nsAString_Init(&path, gre_path); nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); @@ -408,6 +391,49 @@ static BOOL load_gecko(void) return TRUE; } +static CRITICAL_SECTION cs_load_gecko; +static CRITICAL_SECTION_DEBUG cs_load_gecko_dbg = +{ + 0, 0, &cs_load_gecko, + { &cs_load_gecko_dbg.ProcessLocksList, &cs_load_gecko_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": load_gecko") } +}; +static CRITICAL_SECTION cs_load_gecko = { &cs_load_gecko_dbg, -1, 0, 0, 0, 0 }; + +static BOOL load_gecko(void) +{ + PRUnichar gre_path[MAX_PATH]; + BOOL ret = FALSE; + + static LONG loading_thread; + + TRACE("()\n"); + + /* load_gecko may be called recursively */ + if(loading_thread == GetCurrentThreadId()) + return pCompMgr != NULL; + + EnterCriticalSection(&cs_load_gecko); + + if(!loading_thread) { + loading_thread = GetCurrentThreadId(); + + if(load_wine_gecko(gre_path) + || load_mozctl(gre_path) + || load_mozilla(gre_path) + || (install_wine_gecko() && load_wine_gecko(gre_path))) + ret = init_xpcom(gre_path); + else + MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); + }else { + ret = pCompMgr != NULL; + } + + LeaveCriticalSection(&cs_load_gecko); + + return ret; +} + void *nsalloc(size_t size) { return nsIMemory_Alloc(nsmem, size);

1 0

Andrew Talbot : version: Constify a formal parameter of VerQueryValue{A|W}( ).
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 908903b7f105c62061d62959fd8d8c866095dcdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=908903b7f105c62061d62959f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 13 16:46:56 2007 +0000 version: Constify a formal parameter of VerQueryValue{A|W}(). --- dlls/version/info.c | 4 ++-- include/winver.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 92553ea..84a7eed 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -752,7 +752,7 @@ static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPC /*********************************************************************** * VerQueryValueA [VERSION.@] */ -BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock, +BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const char rootA[] = "\\"; @@ -799,7 +799,7 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPSTR lpSubBlock, /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPWSTR lpSubBlock, +BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const WCHAR rootW[] = { '\\', 0 }; diff --git a/include/winver.h b/include/winver.h index 6c1217e..ff4233a 100644 --- a/include/winver.h +++ b/include/winver.h @@ -159,8 +159,8 @@ DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWST DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT); DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT); #define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPVOID,LPSTR,LPVOID*,UINT*); -BOOL WINAPI VerQueryValueW(LPVOID,LPWSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); #define VerQueryValue WINELIB_NAME_AW(VerQueryValue) DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 92f675749f6497d1d978307b50092c1567494999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f675749f6497d1d978307b5… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Feb 13 09:37:05 2007 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index bb00f83..446ae69 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 1998 Juergen Schmied - * Copyright 2006 YunSong Hwang + * Copyright 2006, 2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -175,13 +175,13 @@ IDS_TRASHMULTIPLE_TEXT "�� '%1' ��(��) �� ⸦ �ٶ��ϱ�?" IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "�� �� Ȯ��" -IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" +IDS_OVERWRITEFOLDER_TEXT " �� ̹� '%1'�̶� �̸�� ϰ� �ֽ��ϴ�.\n\n"\ + "�� ̸�� Ѵٸ� ��õ� �� ü�� Դϴ�\n"\ + " ��ü�� Դϴ�. �� ̵��Ű�ų� ��ϰڽ��ϱ�?" + /* message box strings */ -IDS_RESTART_TITLE "�ٽ� ��" +IDS_RESTART_TITLE "�ٽ� ��" IDS_RESTART_PROMPT "�� ϰڽ��ϱ�?" IDS_SHUTDOWN_TITLE "��" IDS_SHUTDOWN_PROMPT "�� Wine �� ڽ��ϱ�?"

1 0

Mike McCormack : msi: Find pending custom actions by GUID.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: d50c62884a4bbd5835f0ab9aaaa1598fa13cf022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50c62884a4bbd5835f0ab9aa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 13 22:48:05 2007 +0900 msi: Find pending custom actions by GUID. --- dlls/msi/custom.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 1 - 3 files changed, 74 insertions(+), 11 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4fc1ea9..ba5c825 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -61,12 +61,24 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, typedef UINT (WINAPI *MsiCustomActionEntryPoint)( MSIHANDLE ); +static CRITICAL_SECTION msi_custom_action_cs; +static CRITICAL_SECTION_DEBUG msi_custom_action_cs_debug = +{ + 0, 0, &msi_custom_action_cs, + { &msi_custom_action_cs_debug.ProcessLocksList, + &msi_custom_action_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": msi_custom_action_cs") } +}; +static CRITICAL_SECTION msi_custom_action_cs = { &msi_custom_action_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list msi_pending_custom_actions = LIST_INIT( msi_pending_custom_actions ); + static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR action, UINT options) { if (!package->script) return TRUE; - if ((options & msidbCustomActionTypeClientRepeat) == + if ((options & msidbCustomActionTypeClientRepeat) == msidbCustomActionTypeClientRepeat) { if (!(package->script->InWhatSequence & SEQUENCE_UI && @@ -405,11 +417,14 @@ typedef struct _msi_custom_action_info { HANDLE handle; LPWSTR action; INT type; + GUID guid; } msi_custom_action_info; static void free_custom_action_data( msi_custom_action_info *info ) { + EnterCriticalSection( &msi_custom_action_cs ); list_remove( &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); if (info->handle) CloseHandle( info->handle ); msi_free( info->action ); @@ -445,15 +460,46 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) return rc; } +static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) +{ + msi_custom_action_info *info; + BOOL found = FALSE; + + EnterCriticalSection( &msi_custom_action_cs ); + + LIST_FOR_EACH_ENTRY( info, &msi_pending_custom_actions, msi_custom_action_info, entry ) + { + if (IsEqualGUID( &info->guid, guid )) + { + found = TRUE; + break; + } + } + + LeaveCriticalSection( &msi_custom_action_cs ); + + if (!found) + return NULL; + + return info; +} -static DWORD WINAPI ACTION_CallDllFunction( msi_custom_action_info *info ) +static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid ) { + msi_custom_action_info *info; MsiCustomActionEntryPoint fn; MSIHANDLE hPackage; HANDLE hModule; LPSTR proc; UINT r = ERROR_FUNCTION_FAILED; + info = find_action_by_guid( guid ); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid( guid) ); + return r; + } + TRACE("%s %s\n", debugstr_w( info->dllname ), debugstr_w( info->function ) ); hModule = LoadLibraryW( info->dllname ); @@ -488,12 +534,12 @@ static DWORD WINAPI ACTION_CallDllFunction( msi_custom_action_info *info ) static DWORD WINAPI DllThread( LPVOID arg ) { - msi_custom_action_info *info = arg; + LPGUID guid = arg; DWORD rc = 0; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); - rc = ACTION_CallDllFunction( info ); + rc = ACTION_CallDllFunction( guid ); TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); @@ -516,9 +562,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->function = strdupW( function ); info->dllname = strdupW( dllname ); info->action = strdupW( action ); - list_add_tail( &package->pending_custom_actions, &info->entry ); + CoCreateGuid( &info->guid ); + + EnterCriticalSection( &msi_custom_action_cs ); + list_add_tail( &msi_pending_custom_actions, &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); - info->handle = CreateThread( NULL, 0, DllThread, info, 0, NULL ); + info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); if (!info->handle) { free_custom_action_data( info ); @@ -823,12 +873,27 @@ void ACTION_FinishCustomActions(MSIPACKAGE* package) msi_free( action ); } - while ((item = list_head( &package->pending_custom_actions ))) + while (1) { + HANDLE handle; msi_custom_action_info *info; + EnterCriticalSection( &msi_custom_action_cs ); + item = list_head( &msi_pending_custom_actions ); info = LIST_ENTRY( item, msi_custom_action_info, entry ); - msi_dialog_check_messages( info->handle ); - free_custom_action_data( info ); + + if (item && info->package == package ) + { + handle = info->handle; + free_custom_action_data( info ); + } + else + handle = NULL; + LeaveCriticalSection( &msi_custom_action_cs ); + + if (!item) + break; + + msi_dialog_check_messages( handle ); } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 09a3e55..b01bb27 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -230,7 +230,6 @@ typedef struct tagMSIPACKAGE struct tagMSISCRIPT *script; struct list RunningActions; - struct list pending_custom_actions; LPWSTR BaseURL; LPWSTR PackagePath; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f0163c4..b78910d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -490,7 +490,6 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->extensions ); list_init( &package->progids ); list_init( &package->RunningActions ); - list_init( &package->pending_custom_actions ); for (i=0; i<PROPERTY_HASH_SIZE; i++) list_init( &package->props[i] );

1 0