wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

Francois Gouget : usp10/tests: Add trailing '\n's to ok() calls.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: b149f3c717b43adade3789618d7a47c47df03ac8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b149f3c717b43adade37896… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 6 12:30:14 2006 +0200 usp10/tests: Add trailing '\n's to ok() calls. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 85546b1..eec8e35 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -485,7 +485,7 @@ static void test_ScriptXtoX(void) hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); - ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d", piTrailing); + ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d\n", piTrailing); iX = 1954; cChars = 10; cGlyphs = 10;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: ce9b4baad8bc174b0175a57d5fc6eb43e14d0fd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce9b4baad8bc174b0175a57… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 6 12:28:32 2006 +0200 Assorted spelling fixes. --- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/tests/refcount.c | 4 ++-- dlls/mciavi32/mciavi.c | 2 +- dlls/mciseq/mcimidi.c | 8 ++++---- dlls/mciwave/mciwave.c | 4 ++-- dlls/msi/msi.c | 2 +- dlls/ole32/compobj.c | 2 +- dlls/shell32/trash.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/vertexbuffer.c | 2 +- include/mlang.idl | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ce9b4baad8bc174b017…

1 0

Roderick Colenbrander : wined3d: texture caps fixes.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 930a9a1d02daa5c4352c541b1a6ac3decfd64b72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=930a9a1d02daa5c4352c541… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 6 22:50:40 2006 +0200 wined3d: texture caps fixes. --- dlls/wined3d/directx.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8c7ab5..7da6b9d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1839,8 +1839,47 @@ #endif WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - *pCaps->CubeTextureFilterCaps = 0; - *pCaps->VolumeTextureFilterCaps = 0; + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { + *pCaps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | + WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } + + if (GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + *pCaps->CubeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | + WINED3DPTFILTERCAPS_MAGFPOINT | + WINED3DPTFILTERCAPS_MINFLINEAR | + WINED3DPTFILTERCAPS_MINFPOINT | + WINED3DPTFILTERCAPS_MIPFLINEAR | + WINED3DPTFILTERCAPS_MIPFPOINT | + WINED3DPTFILTERCAPS_LINEAR | + WINED3DPTFILTERCAPS_LINEARMIPLINEAR | + WINED3DPTFILTERCAPS_LINEARMIPNEAREST | + WINED3DPTFILTERCAPS_MIPLINEAR | + WINED3DPTFILTERCAPS_MIPNEAREST | + WINED3DPTFILTERCAPS_NEAREST; + + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { + *pCaps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | + WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } + } else + *pCaps->CubeTextureFilterCaps = 0; + + if (GL_SUPPORT(EXT_TEXTURE3D)) { + *pCaps->VolumeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | + WINED3DPTFILTERCAPS_MAGFPOINT | + WINED3DPTFILTERCAPS_MINFLINEAR | + WINED3DPTFILTERCAPS_MINFPOINT | + WINED3DPTFILTERCAPS_MIPFLINEAR | + WINED3DPTFILTERCAPS_MIPFPOINT | + WINED3DPTFILTERCAPS_LINEAR | + WINED3DPTFILTERCAPS_LINEARMIPLINEAR | + WINED3DPTFILTERCAPS_LINEARMIPNEAREST | + WINED3DPTFILTERCAPS_MIPLINEAR | + WINED3DPTFILTERCAPS_MIPNEAREST | + WINED3DPTFILTERCAPS_NEAREST; + } else + *pCaps->VolumeTextureFilterCaps = 0; *pCaps->TextureAddressCaps = D3DPTADDRESSCAPS_INDEPENDENTUV | D3DPTADDRESSCAPS_CLAMP |

1 0

Roderick Colenbrander : wined3d: General constant caps fix.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: bd6f0b23d6f6ad73962ee465a35d00260141ddb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd6f0b23d6f6ad73962ee46… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 6 13:53:19 2006 +0200 wined3d: General constant caps fix. --- dlls/wined3d/directx.c | 23 ++++++++++++++--------- include/wine/wined3d_gl.h | 1 + 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 04cd41d..f8c7ab5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -85,7 +85,6 @@ static WineD3D_Context* WineD3D_CreateFa BOOL failed = FALSE; int num; XWindowAttributes win_attr; - TRACE_(d3d_caps)("Creating Fake GL Context\n"); ctx.drawable = (Drawable) GetPropA(GetDesktopWindow(), "__wine_x11_whole_window"); @@ -290,7 +289,7 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i const char *gl_string = NULL; const char *gl_string_cursor = NULL; GLint gl_max; - GLfloat gl_float; + GLfloat gl_floatv[2]; Bool test = 0; int major, minor; WineD3D_Context *fake_ctx = NULL; @@ -545,9 +544,9 @@ #undef USE_GL_FUNC gl_info->max_texture_size = gl_max; TRACE_(d3d_caps)("Maximum texture size support - max texture size=%d\n", gl_max); - glGetFloatv(GL_POINT_SIZE_RANGE, &gl_float); - gl_info->max_pointsize = gl_float; - TRACE_(d3d_caps)("Maximum point size support - max texture size=%f\n", gl_float); + glGetFloatv(GL_POINT_SIZE_RANGE, gl_floatv); + gl_info->max_pointsize = gl_floatv[1]; + TRACE_(d3d_caps)("Maximum point size support - max point size=%f\n", gl_floatv[1]); /* Parse the gl supported features, in theory enabling parts of our code appropriately */ GL_Extensions = (const char *) glGetString(GL_EXTENSIONS); @@ -683,6 +682,9 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_EXT_texture3D") == 0) { TRACE_(d3d_caps)(" FOUND: EXT_texture3D support\n"); gl_info->supported[EXT_TEXTURE3D] = TRUE; + glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &gl_max); + TRACE_(d3d_caps)("Max texture3D size: %d\n", gl_max); + gl_info->max_texture3d_size = gl_max; } else if (strcmp(ThisExtn, "GL_EXT_texture_compression_s3tc") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Texture S3TC compression support\n"); gl_info->supported[EXT_TEXTURE_COMPRESSION_S3TC] = TRUE; @@ -1866,10 +1868,13 @@ #endif *pCaps->MaxTextureWidth = GL_LIMITS(texture_size); *pCaps->MaxTextureHeight = GL_LIMITS(texture_size); - *pCaps->MaxVolumeExtent = 0; + if(GL_SUPPORT(EXT_TEXTURE3D)) + *pCaps->MaxVolumeExtent = GL_LIMITS(texture3d_size); + else + *pCaps->MaxVolumeExtent = 0; *pCaps->MaxTextureRepeat = 32768; - *pCaps->MaxTextureAspectRatio = 32768; + *pCaps->MaxTextureAspectRatio = GL_LIMITS(texture_size); *pCaps->MaxVertexW = 1.0; *pCaps->GuardBandLeft = 0; @@ -1961,8 +1966,8 @@ #endif /* FIXME: Add D3DVTXPCAPS_TWEENING */ - *pCaps->MaxPrimitiveCount = 0xFFFFFFFF; - *pCaps->MaxVertexIndex = 0xFFFFFFFF; + *pCaps->MaxPrimitiveCount = 0xFFFFF; /* For now set 2^20-1 which is used by most >=Geforce3/Radeon8500 cards */ + *pCaps->MaxVertexIndex = 0xFFFFF; *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 923ca4a..5af463e 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1703,6 +1703,7 @@ typedef struct _WineD3D_GL_Info { UINT max_sampler_stages; UINT max_clipplanes; UINT max_texture_size; + UINT max_texture3d_size; float max_pointsize; UINT max_blends; UINT max_anisotropy;

1 0

Tijl Coosemans : loader/pthread: Added pthread_attr_get_np support.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: fc8172f7eea19aaa7b80d72ac255a4905a0bed2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc8172f7eea19aaa7b80d72… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Sat Aug 5 23:31:07 2006 +0200 loader/pthread: Added pthread_attr_get_np support. --- configure | 4 ++++ configure.ac | 2 ++ include/config.h.in | 6 ++++++ include/wine/pthread.h | 3 +++ loader/pthread.c | 6 ++++++ 5 files changed, 21 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 254ec3b..114bead 100755 --- a/configure +++ b/configure @@ -8339,6 +8339,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ CoreAudio/CoreAudio.h \ @@ -8393,6 +8394,7 @@ for ac_header in \ poll.h \ process.h \ pthread.h \ + pthread_np.h \ pwd.h \ regex.h \ sched.h \ @@ -13955,7 +13957,9 @@ LIBS="$LIBS $LIBPTHREAD" + for ac_func in \ + pthread_attr_get_np \ pthread_getattr_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np diff --git a/configure.ac b/configure.ac index 963746f..8f7ae2f 100644 --- a/configure.ac +++ b/configure.ac @@ -211,6 +211,7 @@ AC_CHECK_HEADERS(\ poll.h \ process.h \ pthread.h \ + pthread_np.h \ pwd.h \ regex.h \ sched.h \ @@ -779,6 +780,7 @@ #include <pthread.h>]) dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ + pthread_attr_get_np \ pthread_getattr_np \ pthread_get_stackaddr_np \ pthread_get_stacksize_np, diff --git a/include/config.h.in b/include/config.h.in index 3d1d4b5..5cb7384 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -521,6 +521,9 @@ #undef HAVE_PREAD /* Define to 1 if you have the <process.h> header file. */ #undef HAVE_PROCESS_H +/* Define to 1 if you have the `pthread_attr_get_np' function. */ +#undef HAVE_PTHREAD_ATTR_GET_NP + /* Define to 1 if you have the `pthread_getattr_np' function. */ #undef HAVE_PTHREAD_GETATTR_NP @@ -533,6 +536,9 @@ #undef HAVE_PTHREAD_GET_STACKSIZE_NP /* Define to 1 if you have the <pthread.h> header file. */ #undef HAVE_PTHREAD_H +/* Define to 1 if you have the <pthread_np.h> header file. */ +#undef HAVE_PTHREAD_NP_H + /* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ #undef HAVE_PTHREAD_RWLOCKATTR_T diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 69a1562..1971ebb 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -29,6 +29,9 @@ #ifdef HAVE_PTHREAD_H #define _GNU_SOURCE #include <pthread.h> +#ifdef HAVE_PTHREAD_NP_H +#include <pthread_np.h> +#endif #ifndef HAVE_PTHREAD_RWLOCK_T typedef void *pthread_rwlock_t; diff --git a/loader/pthread.c b/loader/pthread.c index a976c4f..526633e 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -70,6 +70,12 @@ #ifdef HAVE_PTHREAD_GETATTR_NP pthread_getattr_np( pthread_self(), &attr ); pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); pthread_attr_destroy( &attr ); +#elif defined(HAVE_PTHREAD_ATTR_GET_NP) + pthread_attr_t attr; + pthread_attr_init( &attr ); + pthread_attr_get_np( pthread_self(), &attr ); + pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); + pthread_attr_destroy( &attr ); #elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) char dummy; info->stack_size = pthread_get_stacksize_np(pthread_self());

1 0

Mike McCormack : msi: Fix the dialog centering logic.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 72b940e09b33294460e69aefa537e6580262022d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72b940e09b33294460e69ae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 7 17:08:27 2006 +0900 msi: Fix the dialog centering logic. --- dlls/msi/dialog.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 77f8b94..7eef61f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2077,25 +2077,36 @@ static void msi_get_screen_resolution( m *yres = atolW( num ); } -static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, LPRECT pos, LPSIZE sz ) +static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LPRECT pos ) { UINT xres, yres; + POINT center; + SIZE sz; LONG style; - - sz->cx = msi_dialog_scale_unit( dialog, sz->cx ); - sz->cy = msi_dialog_scale_unit( dialog, sz->cy ); + + center.x = MSI_RecordGetInteger( rec, 2 ); + center.y = MSI_RecordGetInteger( rec, 3 ); + + sz.cx = MSI_RecordGetInteger( rec, 4 ); + sz.cy = MSI_RecordGetInteger( rec, 5 ); + + sz.cx = msi_dialog_scale_unit( dialog, sz.cx ); + sz.cy = msi_dialog_scale_unit( dialog, sz.cy ); msi_get_screen_resolution( dialog, &xres, &yres ); - pos->left = MulDiv( pos->left, xres, 100 ); - pos->top = MulDiv( pos->top, yres, 100 ); + center.x = MulDiv( center.x, xres, 100 ); + center.y = MulDiv( center.y, yres, 100 ); /* turn the client pos into the window rectangle */ - pos->right = pos->left + sz->cx; - pos->bottom = pos->top + sz->cy; + pos->left = center.x - sz.cx/2; + pos->right = pos->left + sz.cx; + pos->top = center.y - sz.cy/2; + pos->bottom = pos->top + sz.cy; + + TRACE("%lu %lu %lu %lu\n", pos->left, pos->top, pos->right, pos->bottom); + style = GetWindowLongPtrW( dialog->hwnd, GWL_STYLE ); AdjustWindowRect( pos, style, FALSE ); - sz->cx = pos->right - pos->left; - sz->cy = pos->bottom - pos->top; } static BOOL msi_control_set_next( msi_control *control, msi_control *next ) @@ -2140,7 +2151,6 @@ static LRESULT msi_dialog_oncreate( HWND msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams; MSIRECORD *rec = NULL; LPWSTR title = NULL; - SIZE size; RECT pos; TRACE("%p %p\n", dialog, dialog->package); @@ -2157,11 +2167,7 @@ static LRESULT msi_dialog_oncreate( HWND dialog->scale = msi_dialog_get_sans_serif_height(dialog->hwnd); - pos.left = MSI_RecordGetInteger( rec, 2 ); - pos.top = MSI_RecordGetInteger( rec, 3 ); - size.cx = MSI_RecordGetInteger( rec, 4 ); - size.cy = MSI_RecordGetInteger( rec, 5 ); - msi_dialog_adjust_dialog_pos( dialog, &pos, &size ); + msi_dialog_adjust_dialog_pos( dialog, rec, &pos ); dialog->attributes = MSI_RecordGetInteger( rec, 6 ); @@ -2176,7 +2182,8 @@ static LRESULT msi_dialog_oncreate( HWND SetWindowTextW( hwnd, title ); msi_free( title ); - SetWindowPos( hwnd, 0, pos.left, pos.top, size.cx, size.cy, + SetWindowPos( hwnd, 0, pos.left, pos.top, + pos.right - pos.left, pos.bottom - pos.top, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW ); msi_dialog_build_font_list( dialog );

1 0

Mike McCormack : kernel32: Change some FIXMEs to WARNs.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 315c097a73272c2145d2b1f214e7b9a4df958fcc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=315c097a73272c2145d2b1f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 7 15:39:11 2006 +0900 kernel32: Change some FIXMEs to WARNs. --- dlls/kernel/powermgnt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/powermgnt.c b/dlls/kernel/powermgnt.c index f0c7f37..ceea321 100644 --- a/dlls/kernel/powermgnt.c +++ b/dlls/kernel/powermgnt.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powermgnt); */ BOOL WINAPI GetDevicePowerState(HANDLE hDevice, BOOL* pfOn) { - FIXME("(hDevice %p pfOn %p): stub\n", hDevice, pfOn); + WARN("(hDevice %p pfOn %p): stub\n", hDevice, pfOn); return TRUE; /* no information */ } @@ -39,7 +39,7 @@ BOOL WINAPI GetDevicePowerState(HANDLE h */ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr) { - FIXME("(): stub, harmless.\n"); + WARN("(): stub, harmless.\n"); return FALSE; /* no power management support */ } @@ -48,7 +48,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTE */ BOOL WINAPI IsSystemResumeAutomatic(void) { - FIXME("(): stub, harmless.\n"); + WARN("(): stub, harmless.\n"); return FALSE; } @@ -57,7 +57,7 @@ BOOL WINAPI IsSystemResumeAutomatic(void */ BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency) { - FIXME("(): stub, harmless.\n"); + WARN("(): stub, harmless.\n"); return TRUE; } @@ -67,7 +67,7 @@ BOOL WINAPI RequestWakeupLatency(LATENCY BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, BOOL force_flag) { - FIXME("(): stub, harmless.\n"); + WARN("(): stub, harmless.\n"); /* suspend_or_hibernate flag: w95 does not support this feature anyway */ @@ -95,7 +95,7 @@ EXECUTION_STATE WINAPI SetThreadExecutio ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; EXECUTION_STATE old = current; - FIXME("(0x%lx): stub, harmless.\n", flags); + WARN("(0x%lx): stub, harmless.\n", flags); if (!(current & ES_CONTINUOUS) || (flags & ES_CONTINUOUS)) current = flags;

1 0

Mike McCormack : cabinet: Fix and test the undocumented Extract function.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: c63b348a8a2128a58d4bd1a7e260397388e41f20 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c63b348a8a2128a58d4bd1a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 7 13:39:43 2006 +0900 cabinet: Fix and test the undocumented Extract function. The paths are MAX_PATH length. The last field is list of files which is checked when flags = 0. Add tests for the flag in the file list. --- dlls/cabinet/cabinet.h | 8 ++-- dlls/cabinet/cabinet_main.c | 5 +- dlls/cabinet/tests/extract.c | 87 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 91 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index d658cdf..53744af 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -621,7 +621,7 @@ #define EXTRACT_EXTRACTFILES 0x00000002 struct ExtractFileList { LPSTR filename; struct ExtractFileList *next; - BOOL unknown; /* always 1L */ + BOOL flag; } ; /* the first parameter of the function extract */ @@ -631,8 +631,10 @@ typedef struct { struct ExtractFileList *filelist; /* 0x010 */ long filecount; /* 0x014 */ DWORD flags; /* 0x018 */ - char directory[0x104]; /* 0x01c */ - char lastfile[0x20c]; /* 0x120 */ + char directory[MAX_PATH]; /* 0x01c */ + char lastfile[MAX_PATH]; /* 0x120 */ + char unknown2[MAX_PATH]; /* 0x224 */ + struct ExtractFileList *filterlist; /* 0x328 */ } EXTRACTdest; diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 3c69bf9..ccba932 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -157,7 +157,7 @@ static long fdi_seek(INT_PTR hf, long di static void fill_file_node(struct ExtractFileList *pNode, LPSTR szFilename) { pNode->next = NULL; - pNode->unknown = TRUE; + pNode->flag = FALSE; pNode->filename = HeapAlloc(GetProcessHeap(), 0, strlen(szFilename) + 1); lstrcpyA(pNode->filename, szFilename); @@ -216,7 +216,8 @@ static INT_PTR fdi_notify_extract(FDINOT pDestination->filecount++; } - if (pDestination->flags & EXTRACT_EXTRACTFILES) + if ((pDestination->flags & EXTRACT_EXTRACTFILES) || + file_in_list(pDestination->filterlist, pfdin->psz1)) { /* skip this file it it's not in the file list */ if (!file_in_list(pDestination->filelist, pfdin->psz1)) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index a108c92..e31318b 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -20,9 +20,17 @@ #include <stdio.h> #include <windows.h> -#include <fci.h> +#include "fci.h" #include "wine/test.h" +#ifndef INVALID_FILE_ATTRIBUTES +#define INVALID_FILE_ATTRIBUTES 0xffffffff +#endif + +#ifndef INVALID_SET_FILE_POINTER +#define INVALID_SET_FILE_POINTER 0xffffffff +#endif + /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 #define FOLDER_THRESHOLD 900000 @@ -38,7 +46,7 @@ #define EXTRACT_EXTRACTFILES 0x00000002 struct ExtractFileList { LPSTR filename; struct ExtractFileList *next; - BOOL unknown; /* always 1L */ + BOOL flag; }; /* the first parameter of the function extract */ @@ -48,8 +56,10 @@ typedef struct { struct ExtractFileList *filelist; /* 0x010 */ long filecount; /* 0x014 */ long flags; /* 0x018 */ - char directory[0x104]; /* 0x01c */ - char lastfile[0x20c]; /* 0x120 */ + char directory[MAX_PATH]; /* 0x01c */ + char lastfile[MAX_PATH]; /* 0x120 */ + char unknown2[MAX_PATH]; /* 0x224 */ + struct ExtractFileList *filterlist; /* 0x328 */ } EXTRACTDEST; /* function pointers */ @@ -310,6 +320,16 @@ static void create_cab_file(void) ok(res, "Failed to destroy the cabinet\n"); } +static BOOL check_list(EXTRACTDEST *dest, const char *filename, BOOL flag) +{ + struct ExtractFileList *i; + + for (i = dest->filelist; i; i=i->next) + if (!lstrcmp(filename, i->filename)) + return (flag == i->flag); + return FALSE; +} + static void test_Extract(void) { EXTRACTDEST extractDest; @@ -362,9 +382,15 @@ static void test_Extract(void) ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(check_list(&extractDest, "testdir\\d.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "testdir\\c.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "b.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "a.txt", FALSE), "list entry wrong\n"); + /* remove two of the files in the list */ extractDest.filelist->next = extractDest.filelist->next->next; extractDest.filelist->next->next = NULL; + extractDest.filterlist = NULL; CreateDirectoryA("dest", NULL); res = pExtract(&extractDest, "extract.cab"); ok(res == S_OK, "Expected S_OK, got %ld\n", res); @@ -372,6 +398,59 @@ static void test_Extract(void) ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + + todo_wine { + ok(check_list(&extractDest, "testdir\\d.txt", FALSE), "list entry wrong\n"); + ok(!check_list(&extractDest, "testdir\\c.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "b.txt", FALSE), "list entry wrong\n"); + ok(!check_list(&extractDest, "a.txt", FALSE), "list entry wrong\n"); + } + + extractDest.flags = 1; + extractDest.filelist = NULL; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + + todo_wine { + ok(check_list(&extractDest, "testdir\\d.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "testdir\\c.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "b.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "a.txt", TRUE), "list entry wrong\n"); + } + + extractDest.flags = 0; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); + + todo_wine { + ok(check_list(&extractDest, "testdir\\d.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "testdir\\c.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "b.txt", TRUE), "list entry wrong\n"); + ok(check_list(&extractDest, "a.txt", TRUE), "list entry wrong\n"); + } + + extractDest.flags = 0; + extractDest.filterlist = extractDest.filelist; + res = pExtract(&extractDest, "extract.cab"); + ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to exist\n"); + + ok(check_list(&extractDest, "testdir\\d.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "testdir\\c.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "b.txt", FALSE), "list entry wrong\n"); + ok(check_list(&extractDest, "a.txt", FALSE), "list entry wrong\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); ok(RemoveDirectoryA("dest"), "Expected dest\\testdir to exist\n"); }

1 0

Mike McCormack : cabinet: Split the cabinet path for FDICopy.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 968a4457250e61cdbe5537c375b1d48ad5ce9fd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=968a4457250e61cdbe5537c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 7 13:39:06 2006 +0900 cabinet: Split the cabinet path for FDICopy. --- dlls/cabinet/cabinet_main.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index fa8f1b4..3c69bf9 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -303,7 +303,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest HRESULT res = S_OK; HFDI hfdi; ERF erf; - static CHAR empty[] = ""; + char *str, *path, *name; TRACE("(%p, %s)\n", dest, szCabName); @@ -323,10 +323,32 @@ HRESULT WINAPI Extract(EXTRACTdest *dest if (GetFileAttributesA(dest->directory) == INVALID_FILE_ATTRIBUTES) return S_OK; - if (!FDICopy(hfdi, (LPSTR)szCabName, empty, 0, + /* split the cabinet name into path + name */ + str = HeapAlloc(GetProcessHeap(), 0, lstrlenA(szCabName)+1); + if (!str) + { + res = E_OUTOFMEMORY; + goto end; + } + lstrcpyA(str, szCabName); + + path = str; + name = strrchr(path, '\\'); + if (name) + *name++ = 0; + else + { + name = path; + path = NULL; + } + + if (!FDICopy(hfdi, name, path, 0, fdi_notify_extract, NULL, dest)) res = E_FAIL; + HeapFree(GetProcessHeap(), 0, str); +end: + FDIDestroy(hfdi); return res;

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : oleview: Updated Korean resource.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 9d9ae2e5b7677f7b7bea1037222ce8738eff1f37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d9ae2e5b7677f7b7bea103… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Aug 7 08:46:29 2006 +0900 oleview: Updated Korean resource. --- programs/oleview/Ko.rc | 73 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 3 deletions(-) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 8321830..52f6c4c 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -36,7 +36,7 @@ IDM_MENU MENU } POPUP " ��ü(&O)" { - POPUP "&CoCreateInstance �÷�" + POPUP "&CoCreateInstance �÷��" { MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL @@ -72,14 +72,32 @@ IDM_MENU MENU } } +IDM_TYPELIB MENU +{ + POPUP "��(&F)" + { + MENUITEM "�ٸ� �̸�� (&S)", IDM_SAVEAS + MENUITEM "�ݱ�(&C)", IDM_CLOSE + } + POPUP "��(&V)" + { + MENUITEM "Ÿ�� (&G)", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "��(&T)", IDM_TOOLBAR + MENUITEM "��¹�(&S)", IDM_STATUSBAR,CHECKED + } +} + + STRINGTABLE { IDS_APPNAME "OleView" IDS_APPTITLE "OleView" IDS_READY "�غ�" - IDS_ABOUT "OleView - OLE/COM ��ü ��ֱ�" + IDS_ABOUT "OleView - OLE/COM ��ü ��" IDS_ABOUTVER "�� 1.0" - + IDS_TYPELIBTITLE "ITypeLib ��" + IDM_BIND, "�� " IDM_TYPELIB, "Ÿ�� ̺귯�� " IDM_SYSCONF, "�ӽ� ��ü�� DCOM�� ٲٱ�" @@ -101,6 +119,10 @@ STRINGTABLE IDM_REFRESH, "�� ħ" IDM_ABOUT, "��α׷� ��, ��, ��۱� ��ֱ�" + IDM_SAVEAS, ".IDL �̳� .H file�� " + IDM_CLOSE, "â �ݱ�" + IDM_GROUP, "Ÿ�� Ÿ�Կ� �� з�" + IDS_TREE_OC, "ObjectClasses" IDS_TREE_GBCC, "��Ʈ �з�" IDS_TREE_O1O, "OLE 1.0 ��ü" @@ -117,6 +139,9 @@ STRINGTABLE IDS_CGCOFAIL, "CoGetClassObject ��." IDS_ERROR_UNKN, "�˼� �� " + IDS_TRUE "��" + IDS_FALSE "��" + IDS_BYTES "��Ʈ" } DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 @@ -142,3 +167,45 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "Ȯ��(&O)", IDOK, 70, 80, 45, 14 PUSHBUTTON "��(&C)", IDCANCEL, 120, 80, 45, 14 } + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�⺻ ��̽� ��" +FONT 8, "MS Shell Dlg" +{ + LTEXT "��̽�", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "Ÿ�� (&V)", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersist ��̽� ��" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ŭ�� ̸�:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "IPersistStream ��̽� ��" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ŭ�� ̸�:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} +

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
75
Older →

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 August 2006