September 2008 - Wine-commits

Muneyuki Noguchi : wineboot: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 521ad0c7e5e693bb8da90addaca3d00377a7f5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521ad0c7e5e693bb8da90adda… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:11:32 2008 +0900 wineboot: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/wineboot/wineboot_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_Ja.rc b/programs/wineboot/wineboot_Ja.rc index f83ef46..2480d83 100644 --- a/programs/wineboot/wineboot_Ja.rc +++ b/programs/wineboot/wineboot_Ja.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 276, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�ҋ@��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "�L��Z��",IDCANCEL,129,49,50,15 PUSHBUTTON "�v��Z�X�̏I��",IDOK,51,49,71,15

1 0

Muneyuki Noguchi : winefile: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: d9b98122be62d7efd4857bfbcbb19d830f1f8609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9b98122be62d7efd4857bfbc… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:20:58 2008 +0900 winefile: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/winefile/Ja.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/Ja.rc b/programs/winefile/Ja.rc index 7bd1fae..110e8ce 100644 --- a/programs/winefile/Ja.rc +++ b/programs/winefile/Ja.rc @@ -148,7 +148,7 @@ IDM_WINEFILE MENU FIXED IMPURE IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��s" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "�R�}��h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -162,7 +162,7 @@ FONT 8, "MS Shell Dlg" IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�ړ��I��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "�p�X(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -175,7 +175,7 @@ FONT 8, "MS Shell Dlg" IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -197,7 +197,7 @@ END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Sans Serif" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14

1 0

Louis Lenders : msi: Add stub for MsiSetExternalUIRecord.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: e16e15bf0c0534316658677a9d572008a30a487f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16e15bf0c0534316658677a9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Sep 24 18:19:16 2008 +0000 msi: Add stub for MsiSetExternalUIRecord. --- dlls/msi/msi.c | 12 ++++++++++++ dlls/msi/msi.spec | 2 +- include/msi.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 72f6966..7432aee 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3021,3 +3021,15 @@ UINT WINAPI MsiIsProductElevatedA( LPCSTR szProduct, BOOL *pfElevated ) *pfElevated = TRUE; return ERROR_SUCCESS; } + +/*********************************************************************** + * MsiSetExternalUIRecord [MSI.@] + */ +UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD puiHandler, + DWORD dwMessageFilter, LPVOID pvContext, + PINSTALLUI_HANDLER_RECORD ppuiPrevHandler) +{ + FIXME("%p %08x %p %p\n", puiHandler, dwMessageFilter ,pvContext, + ppuiPrevHandler); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index e3a4a63..4ab0bb1 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -274,7 +274,7 @@ 278 stub MsiDetermineApplicablePatchesW 279 stub MsiMessageBoxExA 280 stub MsiMessageBoxExW -281 stub MsiSetExternalUIRecord +281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/include/msi.h b/include/msi.h index f3d4445..c4f5e0d 100644 --- a/include/msi.h +++ b/include/msi.h @@ -364,6 +364,8 @@ static const WCHAR INSTALLPROPERTY_DISKPROMPTW[] = {'D','i','s','k','P','r','o', typedef INT (CALLBACK *INSTALLUI_HANDLERA)(LPVOID, UINT, LPCSTR); typedef INT (CALLBACK *INSTALLUI_HANDLERW)(LPVOID, UINT, LPCWSTR); +typedef INT (CALLBACK *INSTALLUI_HANDLER_RECORD)(LPVOID, UINT, MSIHANDLE); +typedef INSTALLUI_HANDLER_RECORD* PINSTALLUI_HANDLER_RECORD; UINT WINAPI MsiAdvertiseProductA(LPCSTR, LPCSTR, LPCSTR, LANGID); UINT WINAPI MsiAdvertiseProductW(LPCWSTR, LPCWSTR, LPCWSTR, LANGID); @@ -601,6 +603,7 @@ UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL, HWND*); +UINT WINAPI MsiSetExternalUIRecord(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); #ifdef __cplusplus }

1 0

Muneyuki Noguchi : regedit: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 6461d5dc7e06be15ce002612803fd747f84598d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6461d5dc7e06be15ce0026128… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:08:38 2008 +0900 regedit: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/regedit/Ja.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index 437f02a..3ff51a5 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -121,7 +121,7 @@ END IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "��W�X�g��̃G�N�X�|�[�g", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP AUTORADIOBUTTON "��ׂ�(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 @@ -132,7 +132,7 @@ END IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "��:",IDC_STATIC,5,7,119,8 EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL @@ -148,7 +148,7 @@ END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��C�ɓ��ɒǉ�" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "��O:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL @@ -159,7 +159,7 @@ END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��C�ɓ��̍폜" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "��O:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL @@ -170,7 +170,7 @@ END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��̕ҏW" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED @@ -183,7 +183,7 @@ END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "DWORD�l�̕ҏW" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED @@ -199,7 +199,7 @@ END IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "�o�C�i��l�̕ҏW" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED @@ -212,7 +212,7 @@ END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��s��̕ҏW" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED

1 0

Henri Verbeet : wined3d: If a stage isn't mapped to a texture unit, we can' t set default coordinates either.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 2c1e4602a365d51fe3411333e9aabdff2aaa440d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1e4602a365d51fe3411333e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 15:56:48 2008 +0200 wined3d: If a stage isn't mapped to a texture unit, we can't set default coordinates either. --- dlls/wined3d/drawprim.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c4154a7..1700718 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -437,6 +437,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData continue; } + if (texture_idx == -1) continue; + ptrToCoords = (float *)(texCoords[coordIdx] + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); if (texCoords[coordIdx] == NULL) { TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); @@ -449,8 +451,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData } else { int coordsToUse = sd->u.s.texCoords[coordIdx].dwType + 1; /* 0 == WINED3DDECLTYPE_FLOAT1 etc */ - if (texture_idx == -1) continue; - /* The coords to supply depend completely on the fvf / vertex shader */ switch (coordsToUse) { case 4: q = ptrToCoords[3]; /* drop through */

1 0

Henri Verbeet : wined3d: Handle texture coordinates the same way we handle other vertex attributes.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 3a7fcec4d70854da9d3c5d74fb7b215356c80e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7fcec4d70854da9d3c5d74f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 15:56:48 2008 +0200 wined3d: Handle texture coordinates the same way we handle other vertex attributes. --- dlls/wined3d/directx.c | 56 +++++++++++++++++++++++++++++++- dlls/wined3d/drawprim.c | 71 ++++------------------------------------ dlls/wined3d/wined3d_private.h | 4 ++- include/wine/wined3d_gl.h | 12 +++++++ 4 files changed, 77 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7fcec4d70854da9d3c5…

1 0

Henri Verbeet : wined3d: Set the texture name at surface creation.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 0ee57cf142f59d48cc411df9f319a68e965b2a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee57cf142f59d48cc411df9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 15:56:47 2008 +0200 wined3d: Set the texture name at surface creation. This prevents the target from changing during the first PreLoad() call on a surface, which would be inconvenient when attaching a surface to a FBO for example. --- dlls/wined3d/cubetexture.c | 14 +------------- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/texture.c | 5 +---- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d670106..786a40c 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,15 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -static const GLenum cube_targets[6] = { - GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB -}; - /* ******************************************* IWineD3DCubeTexture IUnknown parts follow ******************************************* */ @@ -156,8 +147,7 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { for (i = 0; i < This->baseTexture.levels; i++) { for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { IWineD3DSurface_AddDirtyRect(This->surfaces[j][i], NULL); - surface_set_texture_name(This->surfaces[j][i], This->baseTexture.textureName); - surface_set_texture_target(This->surfaces[j][i], cube_targets[j]); + surface_force_reload(This->surfaces[j][i]); IWineD3DSurface_LoadTexture(This->surfaces[j][i], srgb_mode); } } @@ -183,7 +173,6 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) { for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { IWineD3DSurface_UnLoad(This->surfaces[j][i]); surface_set_texture_name(This->surfaces[j][i], 0); - surface_set_texture_target(This->surfaces[j][i], IWineD3DTexture_GetTextureDimensions(iface)); } } @@ -248,7 +237,6 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i for (i = 0; i < This->baseTexture.levels; ++i) { for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z; ++j) { surface_set_texture_name(This->surfaces[j][i], This->baseTexture.textureName); - surface_set_texture_target(This->surfaces[j][i], cube_targets[j]); } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08ef2e1..1a99b31 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -887,6 +887,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U IWineD3DSurface_SetContainer(object->surfaces[i], (IWineD3DBase *)object); TRACE("Created surface level %d @ %p\n", i, object->surfaces[i]); + surface_set_texture_target(object->surfaces[i], object->target); /* calculate the next mipmap level */ tmpW = max(1, tmpW >> 1); tmpH = max(1, tmpH >> 1); @@ -1132,6 +1133,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface /* Create the 6 faces */ for (j = 0; j < 6; j++) { + static const GLenum cube_targets[6] = { + GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, + GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, + GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB + }; hr=D3DCB_CreateSurface(This->parent, parent, tmpW, tmpW, Format, Usage, Pool, i /* Level */, j, &object->surfaces[j][i],pSharedHandle); @@ -1156,6 +1165,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } IWineD3DSurface_SetContainer(object->surfaces[j][i], (IWineD3DBase *)object); TRACE("Created surface level %d @ %p,\n", i, object->surfaces[j][i]); + surface_set_texture_target(object->surfaces[j][i], cube_targets[j]); } tmpW = max(1, tmpW >> 1); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8390060..2c3f5d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -138,8 +138,7 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { for (i = 0; i < This->baseTexture.levels; i++) { IWineD3DSurface_AddDirtyRect(This->surfaces[i], NULL); - surface_set_texture_name(This->surfaces[i], This->baseTexture.textureName); - surface_set_texture_target(This->surfaces[i], IWineD3DTexture_GetTextureDimensions(iface)); + surface_force_reload(This->surfaces[i]); IWineD3DSurface_LoadTexture(This->surfaces[i], srgb_mode); } } else { @@ -164,7 +163,6 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { for (i = 0; i < This->baseTexture.levels; i++) { IWineD3DSurface_UnLoad(This->surfaces[i]); surface_set_texture_name(This->surfaces[i], 0); - surface_set_texture_target(This->surfaces[i], IWineD3DTexture_GetTextureDimensions(iface)); } IWineD3DBaseTextureImpl_UnLoad((IWineD3DBaseTexture *) iface); @@ -226,7 +224,6 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { UINT i; for (i = 0; i < This->baseTexture.levels; ++i) { surface_set_texture_name(This->surfaces[i], This->baseTexture.textureName); - surface_set_texture_target(This->surfaces[i], IWineD3DTexture_GetTextureDimensions(iface)); } /* Conditinal non power of two textures use a different clamping default. If we're using the GL_WINE_normalized_texrect * partial driver emulation, we're dealing with a GL_TEXTURE_2D texture which has the address mode set to repeat - something

1 0

Henri Verbeet : wined3d: Properly handle the offset for compressed surfaces in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: c6cd7a7717219e7dbe6d6c2bb03b682b53c81c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cd7a7717219e7dbe6d6c2bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 15:56:48 2008 +0200 wined3d: Properly handle the offset for compressed surfaces in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 38 ++++++++------------------------------ 1 files changed, 8 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1a99b31..409c7a1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5902,17 +5902,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, if(pSourceRect != NULL && pSourceRect->top != 0){ offset += pSourceRect->top * srcSurfaceWidth * pSrcSurface->bytesPerPixel; } - TRACE("(%p) glTexSubImage2D, Level %d, left %d, top %d, width %d, height %d , ftm %d, type %d, memory %p\n" - ,This - ,glDescription->level - ,destLeft - ,destTop - ,srcWidth - ,srcHeight - ,glDescription->glFormat - ,glDescription->glType - ,IWineD3DSurface_GetData(pSourceSurface) - ); + TRACE("(%p) glTexSubImage2D, level %d, left %d, top %d, width %d, height %d, fmt %#x, type %#x, memory %p+%#x\n", + This, glDescription->level, destLeft, destTop, srcWidth, srcHeight, glDescription->glFormat, + glDescription->glType, IWineD3DSurface_GetData(pSourceSurface), offset); /* Sanity check */ if (IWineD3DSurface_GetData(pSourceSurface) == NULL) { @@ -5945,6 +5937,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } } else { /* Full width, so just write out the whole texture */ + const unsigned char* data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; if (WINED3DFMT_DXT1 == destFormat || WINED3DFMT_DXT2 == destFormat || @@ -5958,14 +5951,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } if (destFormat != srcFormat) { FIXME("Updating mixed format compressed texture is not curretly support\n"); } else { - GL_EXTCALL(glCompressedTexImage2DARB)(glDescription->target, - glDescription->level, - glDescription->glFormatInternal, - srcWidth, - srcHeight, - 0, - destSize, - IWineD3DSurface_GetData(pSourceSurface)); + GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, + glDescription->glFormatInternal, srcWidth, srcHeight, 0, destSize, data)); } } else { FIXME("Attempting to update a DXT compressed texture without hardware support\n"); @@ -5973,17 +5960,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } else { - const unsigned char* data =((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; - glTexSubImage2D(glDescription->target - ,glDescription->level - ,destLeft - ,destTop - ,srcWidth - ,srcHeight - ,glDescription->glFormat - ,glDescription->glType - ,data - ); + glTexSubImage2D(glDescription->target, glDescription->level, destLeft, destTop, + srcWidth, srcHeight, glDescription->glFormat, glDescription->glType, data); } } checkGLcall("glTexSubImage2D");

1 0

Damjan Jovanovic : oleaut32: Fix double negative sign regression in VarFormat.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 72faaf1273ea093cd2a8a2b4ff330ef2711a6254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72faaf1273ea093cd2a8a2b4f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Sep 24 18:49:19 2008 +0200 oleaut32: Fix double negative sign regression in VarFormat. --- dlls/oleaut32/tests/varformat.c | 2 ++ dlls/oleaut32/varformat.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 00551e7..12d65b6 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -328,6 +328,8 @@ static void test_VarFormat(void) VARFMT(VT_I4,V_I4,1,"0,000,000,000",S_OK,"0,000,000,001"); VARFMT(VT_I4,V_I4,123456789,"#,#.#",S_OK,"123,456,789."); VARFMT(VT_I4,V_I4,123456789,"###, ###, ###",S_OK,"123, 456, 789"); + VARFMT(VT_I4,V_I4,1,"#;-#",S_OK,"1"); + VARFMT(VT_I4,V_I4,-1,"#;-#",S_OK,"-1"); VARFMT(VT_R8,V_R8,1.23456789,"0#.0#0#0#0#0",S_OK,"01.234567890"); VARFMT(VT_R8,V_R8,1.2,"0#.0#0#0#0#0",S_OK,"01.200000000"); VARFMT(VT_R8,V_R8,9.87654321,"#0.#0#0#0#0#",S_OK,"9.87654321"); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 217fb10..79c3053 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1391,7 +1391,7 @@ VARIANT_FormatNumber_Bool: break; case FMT_NUM_DECIMAL: - if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN) && !header->starts[1]) { /* last chance for a negative sign in the .# case */ TRACE("write negative sign\n"); @@ -1476,7 +1476,7 @@ VARIANT_FormatNumber_Bool: { int count, count_max, position; - if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN)) + if ((np.dwOutFlags & NUMPRS_NEG) && !(dwState & NUM_WROTE_SIGN) && !header->starts[1]) { TRACE("write negative sign\n"); localeValue = LOCALE_SNEGATIVESIGN;

1 0

Alexandre Julliard : oleaut32: Fix a couple of interface registrations to match Windows.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: c6f74a4988f3bf4f8c38676e4dd4629fdb1a0375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f74a4988f3bf4f8c38676e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 25 11:52:16 2008 +0200 oleaut32: Fix a couple of interface registrations to match Windows. --- dlls/oleaut32/regsvr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index a65c109..093e5c7 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -594,11 +594,11 @@ static struct regsvr_interface const interface_list[] = { &CLSID_PSFactoryBuffer }, { &IID_IFontEventsDisp, - "IFontEventsDisp", + "FontEvents", NULL, 7, NULL, - &CLSID_PSFactoryBuffer + &CLSID_PSDispatch }, { &IID_IPropertyBag, "IPropertyBag", @@ -629,11 +629,11 @@ static struct regsvr_interface const interface_list[] = { &CLSID_PSFactoryBuffer }, { &IID_IPictureDisp, - "IPictureDisp", + "Picture", NULL, 7, NULL, - &CLSID_PSFactoryBuffer + &CLSID_PSDispatch }, { &IID_IPersistStreamInit, "IPersistStreamInit", @@ -783,11 +783,11 @@ static struct regsvr_interface const interface_list[] = { &CLSID_PSFactoryBuffer }, { &IID_IFontDisp, - "IFontDisp", + "Font", NULL, 7, NULL, - &CLSID_PSFactoryBuffer + &CLSID_PSDispatch }, { &IID_IQuickActivate, "IQuickActivate",

1 0